diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2020-04-15 20:21:30 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2020-04-15 20:21:30 +0000 |
| commit | 397df744f90e2b6e5edb0b1c1d42076821efecef (patch) | |
| tree | f5c42e3e52d0da53700f7f3581d25d262b3e3463 /sys/kern | |
| parent | da813b4d95c5b2df34b4da3ff4448a284317d2e2 (diff) | |
Make ps_strings in struct image_params into a pointer.
This is a prepratory commit for D24407.
Reviewed by: kib
Obtained from: CheriBSD
Sponsored by: DARPA
Notes
Notes:
svn path=/head/; revision=359987
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/imgact_aout.c | 2 | ||||
| -rw-r--r-- | sys/kern/kern_exec.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index 5a1b400f1d50..8062bac35a4b 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -200,7 +200,7 @@ exec_aout_imgact(struct image_params *imgp) file_offset = 0; /* Pass PS_STRINGS for BSD/OS binaries only. */ if (N_GETMID(*a_out) == MID_ZERO) - imgp->ps_strings = aout_sysvec.sv_psstrings; + imgp->ps_strings = (void *)aout_sysvec.sv_psstrings; break; default: /* NetBSD compatibility */ diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 1e8cd39192fc..c99bd884668d 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1546,6 +1546,7 @@ exec_copyout_strings(struct image_params *imgp, uintptr_t *stack_base) p = imgp->proc; szsigcode = 0; arginfo = (struct ps_strings *)p->p_sysent->sv_psstrings; + imgp->ps_strings = arginfo; if (p->p_sysent->sv_sigcode_base == 0) { if (p->p_sysent->sv_szsigcode != NULL) szsigcode = *(p->p_sysent->sv_szsigcode); |