d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use nitems() macro instead of __arraycount()

Browse Source
This commit is contained in:
Pedro F. Giffuni 2015-06-16 20:19:00 +00:00
parent 1272c4aad2
commit 708694f704
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/kern/stack_protector.c
View File

@ -17,15 +17,14 @@ __stack_chk_fail(void)
panic("stack overflow detected; backtrace may be corrupted"); panic("stack overflow detected; backtrace may be corrupted");
} }
#define __arraycount(__x) (sizeof(__x) / sizeof(__x[0]))
static void static void
__stack_chk_init(void *dummy __unused) __stack_chk_init(void *dummy __unused)
{ {
size_t i; size_t i;
long guard[__arraycount(__stack_chk_guard)]; long guard[nitems(__stack_chk_guard)];
arc4rand(guard, sizeof(guard), 0); 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]; __stack_chk_guard[i] = guard[i];
} }
SYSINIT(stack_chk, SI_SUB_RANDOM, SI_ORDER_ANY, __stack_chk_init, NULL); SYSINIT(stack_chk, SI_SUB_RANDOM, SI_ORDER_ANY, __stack_chk_init, NULL);