summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro F. Giffuni <pfg@FreeBSD.org>2015-06-16 20:19:00 +0000
committerPedro F. Giffuni <pfg@FreeBSD.org>2015-06-16 20:19:00 +0000
commit708694f704dd38c3511a3aea95cf7c72c863c25c (patch)
tree1b349ac0ebec74969668160589ab3d743e9f55bc
parent1272c4aad259a186aa9724f0f8e0d7fe7a4c5e85 (diff)
Notes
-rw-r--r--sys/kern/stack_protector.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/kern/stack_protector.c b/sys/kern/stack_protector.c
index b5f9973e24cf..77be64f4d18f 100644
--- a/sys/kern/stack_protector.c
+++ b/sys/kern/stack_protector.c
@@ -17,15 +17,14 @@ __stack_chk_fail(void)
panic("stack overflow detected; backtrace may be corrupted");
}
-#define __arraycount(__x) (sizeof(__x) / sizeof(__x[0]))
static void
__stack_chk_init(void *dummy __unused)
{
size_t i;
- long guard[__arraycount(__stack_chk_guard)];
+ long guard[nitems(__stack_chk_guard)];
arc4rand(guard, sizeof(guard), 0);
- for (i = 0; i < __arraycount(guard); i++)
+ for (i = 0; i < nitems(guard); i++)
__stack_chk_guard[i] = guard[i];
}
SYSINIT(stack_chk, SI_SUB_RANDOM, SI_ORDER_ANY, __stack_chk_init, NULL);