c18n: Add dummy arguments to _rtld_unw_* to be compatible with libunwind

CTSRD-CHERI · Mar 26, 2024 · 3eb7e56 · 3eb7e56
1 parent a90316a
commit 3eb7e56
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/libexec/rtld-elf/rtld_c18n.c b/libexec/rtld-elf/rtld_c18n.c
@@ -848,8 +848,9 @@ unwind_stack(struct jmp_args ret, void *rcsp, struct trusted_frame *target,
 }
 
 struct jmp_args _rtld_longjmp(struct jmp_args, void *, void **);
-struct jmp_args _rtld_unw_setcontext(struct jmp_args, void *, void **);
-struct jmp_args _rtld_unw_setcontext_unsealed(struct jmp_args, void *, void **);
+struct jmp_args _rtld_unw_setcontext(struct jmp_args, void *, void *, void **);
+struct jmp_args _rtld_unw_setcontext_unsealed(struct jmp_args, void *, void *,
+    void **);
 
 struct jmp_args
 _rtld_longjmp(struct jmp_args ret, void *rcsp, void **buf)
@@ -859,14 +860,16 @@ _rtld_longjmp(struct jmp_args ret, void *rcsp, void **buf)
 }
 
 struct jmp_args
-_rtld_unw_setcontext(struct jmp_args ret, void *rcsp, void **buf)
+_rtld_unw_setcontext(struct jmp_args ret, void *p __unused, void *rcsp,
+    void **buf)
 {
 	return (unwind_stack(ret, rcsp, cheri_unseal(*buf, sealer_unwbuf),
 	    get_trusted_frame()));
 }
 
 struct jmp_args
-_rtld_unw_setcontext_unsealed(struct jmp_args ret, void *rcsp, void **buf)
+_rtld_unw_setcontext_unsealed(struct jmp_args ret, void *p __unused, void *rcsp,
+    void **buf)
 {
 	return (unwind_stack(ret, rcsp, *buf, get_trusted_frame()));
 }