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

Correct pointer subtraction in KASSERT().

Browse Source 
The assertion would never fire without truly spectacular future
programming errors.

Reported by:	Coverity
CID:		1391370
Sponsored by:	DARPA, AFRL
This commit is contained in:
Brooks Davis 2018-05-29 20:03:24 +00:00
parent ed50b91880
commit cbf7e0cba7
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/amd64/linux/linux_sysvec.c
View File

@ -283,8 +283,7 @@ linux_fixup_elf(register_t **stack_base, struct image_params *imgp)
AUXARGS_ENTRY(pos, AT_NULL, 0);
free(imgp->auxargs, M_TEMP);
imgp->auxargs = NULL;
KASSERT((pos - argarray) / sizeof(*pos) <= LINUX_AT_COUNT,
("Too many auxargs"));
KASSERT(pos - argarray <= LINUX_AT_COUNT, ("Too many auxargs"));
error = copyout(argarray, auxbase, sizeof(*argarray) * LINUX_AT_COUNT);
free(argarray, M_TEMP);

3
sys/amd64/linux32/linux32_sysvec.c
View File

@ -249,8 +249,7 @@ linux_fixup_elf(register_t **stack_base, struct image_params *imgp)
free(imgp->auxargs, M_TEMP);
imgp->auxargs = NULL;
KASSERT((pos - argarray) / sizeof(*pos) <= AT_COUNT,
("Too many auxargs"));
KASSERT(pos - argarray <= AT_COUNT, ("Too many auxargs"));
error = copyout(&argarray[0], auxbase, sizeof(*argarray) * AT_COUNT);
free(argarray, M_TEMP);

3
sys/i386/linux/linux_sysvec.c
View File

@ -261,8 +261,7 @@ linux_fixup_elf(register_t **stack_base, struct image_params *imgp)
free(imgp->auxargs, M_TEMP);
imgp->auxargs = NULL;
KASSERT((pos - argarray) / sizeof(*pos) <= LINUX_AT_COUNT,
("Too many auxargs"));
KASSERT(pos - argarray <= LINUX_AT_COUNT, ("Too many auxargs"));
error = copyout(argarray, auxbase, sizeof(*argarray) * LINUX_AT_COUNT);
free(argarray, M_TEMP);