summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2016-02-05 13:11:13 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2016-02-05 13:11:13 +0000
commita53c0ded8cc9e3b71a5c680e66ef591e0f8e1cba (patch)
treead3419eb53d7dd07d6fc3adf351656bfe6c8a6d4
parentc88c7734d6bf254f3171ff8df3d0646e12989569 (diff)
parent1c0cef67dba05c477dba779bc99224693e809a14 (diff)
downloadillumos-joyent-a53c0ded8cc9e3b71a5c680e66ef591e0f8e1cba.tar.gz
[illumos-gate merge]
commit 1c0cef67dba05c477dba779bc99224693e809a14 6604 harden DIF bounds checking
-rw-r--r--usr/src/uts/common/dtrace/dtrace.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/src/uts/common/dtrace/dtrace.c b/usr/src/uts/common/dtrace/dtrace.c
index 7046fd46d1..4f0f882343 100644
--- a/usr/src/uts/common/dtrace/dtrace.c
+++ b/usr/src/uts/common/dtrace/dtrace.c
@@ -567,10 +567,12 @@ dtrace_error(uint32_t *counter)
* Use the DTRACE_LOADFUNC macro to define functions for each of loading a
* uint8_t, a uint16_t, a uint32_t and a uint64_t.
*/
+/* BEGIN CSTYLED */
DTRACE_LOADFUNC(8)
DTRACE_LOADFUNC(16)
DTRACE_LOADFUNC(32)
DTRACE_LOADFUNC(64)
+/* END CSTYLED */
static int
dtrace_inscratch(uintptr_t dest, size_t size, dtrace_mstate_t *mstate)