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
This commit is contained in:
parent
da813b4d95
commit
397df744f9
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=359987
@ -961,7 +961,7 @@ ia32_setregs(struct thread *td, struct image_params *imgp, uintptr_t stack)
|
||||
regs->tf_rflags = PSL_USER | saved_rflags;
|
||||
regs->tf_ss = _udatasel;
|
||||
regs->tf_cs = _ucode32sel;
|
||||
regs->tf_rbx = imgp->ps_strings;
|
||||
regs->tf_rbx = (register_t)imgp->ps_strings;
|
||||
regs->tf_ds = _udatasel;
|
||||
regs->tf_es = _udatasel;
|
||||
regs->tf_fs = _ufssel;
|
||||
|
@ -708,7 +708,7 @@ linux_exec_setregs(struct thread *td, struct image_params *imgp,
|
||||
regs->tf_ss = _udatasel;
|
||||
regs->tf_flags = TF_HASSEGS;
|
||||
regs->tf_cs = _ucode32sel;
|
||||
regs->tf_rbx = imgp->ps_strings;
|
||||
regs->tf_rbx = (register_t)imgp->ps_strings;
|
||||
|
||||
fpstate_drop(td);
|
||||
|
||||
|
@ -3137,6 +3137,7 @@ freebsd32_copyout_strings(struct image_params *imgp, uintptr_t *stack_base)
|
||||
execpath_len = 0;
|
||||
arginfo = (struct freebsd32_ps_strings *)curproc->p_sysent->
|
||||
sv_psstrings;
|
||||
imgp->ps_strings = arginfo;
|
||||
if (imgp->proc->p_sysent->sv_sigcode_base == 0)
|
||||
szsigcode = *(imgp->proc->p_sysent->sv_szsigcode);
|
||||
else
|
||||
|
@ -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 */
|
||||
|
@ -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);
|
||||
|
@ -75,7 +75,7 @@ struct image_params {
|
||||
char *interpreter_name; /* name of the interpreter */
|
||||
void *auxargs; /* ELF Auxinfo structure pointer */
|
||||
struct sf_buf *firstpage; /* first page that we mapped */
|
||||
unsigned long ps_strings; /* PS_STRINGS for BSD/OS binaries */
|
||||
void *ps_strings; /* pointer to ps_string (user space) */
|
||||
struct image_args *args; /* system call arguments */
|
||||
struct sysentvec *sysent; /* system entry vector */
|
||||
char *execpath;
|
||||
|
Loading…
Reference in New Issue
Block a user