upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

imgact_elf: Avoid redefining suword()

Browse source 
Otherwise this interferes with the definition for sanitizer
interceptors.

Sponsored by:	The FreeBSD Foundation

(cherry picked from commit ebf9886654)
This commit is contained in:
Mark Johnston 2021-07-23 15:40:54 -04:00
parent fdeacf8fdf
commit 24c558ca3c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/kern/imgact_elf.c
View file

@ -1345,7 +1345,7 @@ ret:
return (error);
}
#define suword __CONCAT(suword, __ELF_WORD_SIZE)
#define elf_suword __CONCAT(suword, __ELF_WORD_SIZE)
int
__elfN(freebsd_copyout_auxargs)(struct image_params *imgp, uintptr_t base)
@ -1418,7 +1418,7 @@ __elfN(freebsd_fixup)(uintptr_t *stack_base, struct image_params *imgp)
base = (Elf_Addr *)*stack_base;
base--;
if (suword(base, imgp->args->argc) == -1)
if (elf_suword(base, imgp->args->argc) == -1)
return (EFAULT);
*stack_base = (uintptr_t)base;
return (0);