The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ebf9886654f42718229011524a81e2b36e51f9b1
commit ebf9886654f42718229011524a81e2b36e51f9b1
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2021-07-23 19:40:54 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2021-07-23 19:40:54 +0000
imgact_elf: Avoid redefining suword()
Otherwise this interferes with the definition for sanitizer
interceptors.
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
---
sys/kern/imgact_elf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index 42d922e9f002..ac0427a74818 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -1341,7 +1341,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)
@@ -1414,7 +1414,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);
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
