sysent: Add a sv_psstringssz field to struct sysentvec

The size of the ps_strings structure varies between ABIs, so this is
useful for computing the address of the ps_strings structure relative to
the top of the stack when stack address randomization is enabled.

Reviewed by:	kib
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D33704

This commit is contained in:

Mark Johnston

2022-01-17 11:42:07 -05:00

parent 1544f5add8

commit 3fc21fdd5f

16 changed files with 21 additions and 0 deletions

									
										sys/amd64/amd64/elf_machdep.c
									
		+2
		
												View File
												
				@@ -75,6 +75,7 @@ struct sysentvec elf64_freebsd_sysvec_la48 = {

					.sv_maxuser	= VM_MAXUSER_ADDRESS_LA48,

					.sv_usrstack	= USRSTACK_LA48,

					.sv_psstrings	= PS_STRINGS_LA48,

					.sv_psstringssz	= sizeof(struct ps_strings),

					.sv_stackprot	= VM_PROT_ALL,

					.sv_copyout_auxargs = __elfN(freebsd_copyout_auxargs),

					.sv_copyout_strings	= exec_copyout_strings,

				@@ -117,6 +118,7 @@ struct sysentvec elf64_freebsd_sysvec_la57 = {

					.sv_maxuser	= VM_MAXUSER_ADDRESS_LA57,

					.sv_usrstack	= USRSTACK_LA57,

					.sv_psstrings	= PS_STRINGS_LA57,

					.sv_psstringssz	= sizeof(struct ps_strings),

					.sv_stackprot	= VM_PROT_ALL,

					.sv_copyout_auxargs = __elfN(freebsd_copyout_auxargs),

					.sv_copyout_strings	= exec_copyout_strings,

									
										sys/amd64/linux/linux_sysvec.c
									
		+1
		
												View File
												
				@@ -776,6 +776,7 @@ struct sysentvec elf_linux_sysvec = {

					.sv_maxuser	= VM_MAXUSER_ADDRESS_LA48,

					.sv_usrstack	= LINUX_USRSTACK_LA48,

					.sv_psstrings	= LINUX_PS_STRINGS_LA48,

					.sv_psstringssz	= sizeof(struct ps_strings),

					.sv_stackprot	= VM_PROT_ALL,

					.sv_copyout_auxargs = linux_copyout_auxargs,

					.sv_copyout_strings = linux_copyout_strings,

									
										sys/amd64/linux32/linux32_sysvec.c
									
		+1
		
												View File
												
				@@ -937,6 +937,7 @@ struct sysentvec elf_linux_sysvec = {

					.sv_maxuser	= LINUX32_MAXUSER,

					.sv_usrstack	= LINUX32_USRSTACK,

					.sv_psstrings	= LINUX32_PS_STRINGS,

					.sv_psstringssz	= sizeof(struct linux32_ps_strings),

					.sv_stackprot	= VM_PROT_ALL,

					.sv_copyout_auxargs = linux_copyout_auxargs,

					.sv_copyout_strings = linux_copyout_strings,

									
										sys/arm/arm/elf_machdep.c
									
		+1
		
												View File
												
				@@ -81,6 +81,7 @@ struct sysentvec elf32_freebsd_sysvec = {

					.sv_maxuser	= VM_MAXUSER_ADDRESS,

					.sv_usrstack	= USRSTACK,

					.sv_psstrings	= PS_STRINGS,

					.sv_psstringssz	= sizeof(struct ps_strings),

					.sv_stackprot	= VM_PROT_ALL,

					.sv_copyout_auxargs = __elfN(freebsd_copyout_auxargs),

					.sv_copyout_strings = exec_copyout_strings,

									
										sys/arm64/arm64/elf32_machdep.c
									
		+1
		
												View File
												
				@@ -99,6 +99,7 @@ static struct sysentvec elf32_freebsd_sysvec = {

					.sv_maxuser	= FREEBSD32_MAXUSER,

					.sv_usrstack	= FREEBSD32_USRSTACK,

					.sv_psstrings	= FREEBSD32_PS_STRINGS,

					.sv_psstringssz	= sizeof(struct freebsd32_ps_strings),

					.sv_stackprot	= VM_PROT_READ | VM_PROT_WRITE,

					.sv_copyout_auxargs = elf32_freebsd_copyout_auxargs,

					.sv_copyout_strings = freebsd32_copyout_strings,

									
										sys/arm64/arm64/elf_machdep.c
									
		+1
		
												View File
												
				@@ -77,6 +77,7 @@ static struct sysentvec elf64_freebsd_sysvec = {

					.sv_maxuser	= VM_MAXUSER_ADDRESS,

					.sv_usrstack	= USRSTACK,

					.sv_psstrings	= PS_STRINGS,

					.sv_psstringssz	= sizeof(struct ps_strings),

					.sv_stackprot	= VM_PROT_READ | VM_PROT_WRITE,

					.sv_copyout_auxargs = __elfN(freebsd_copyout_auxargs),

					.sv_copyout_strings = exec_copyout_strings,

									
										sys/arm64/linux/linux_sysvec.c
									
		+1
		
												View File
												
				@@ -519,6 +519,7 @@ struct sysentvec elf_linux_sysvec = {

					.sv_maxuser	= VM_MAXUSER_ADDRESS,

					.sv_usrstack	= LINUX_USRSTACK,

					.sv_psstrings	= LINUX_PS_STRINGS,

					.sv_psstringssz	= sizeof(struct ps_strings),

					.sv_stackprot	= VM_PROT_READ | VM_PROT_WRITE,

					.sv_copyout_auxargs = linux_copyout_auxargs,

					.sv_copyout_strings = linux_copyout_strings,

									
										sys/compat/ia32/ia32_sysvec.c
									
		+1
		
												View File
												
				@@ -121,6 +121,7 @@ struct sysentvec ia32_freebsd_sysvec = {

					.sv_maxuser	= FREEBSD32_MAXUSER,

					.sv_usrstack	= FREEBSD32_USRSTACK,

					.sv_psstrings	= FREEBSD32_PS_STRINGS,

					.sv_psstringssz	= sizeof(struct freebsd32_ps_strings),

					.sv_stackprot	= VM_PROT_ALL,

					.sv_copyout_auxargs	= elf32_freebsd_copyout_auxargs,

					.sv_copyout_strings	= freebsd32_copyout_strings,

									
										sys/i386/i386/elf_machdep.c
									
		+1
		
												View File
												
				@@ -70,6 +70,7 @@ struct sysentvec elf32_freebsd_sysvec = {

					.sv_maxuser	= VM_MAXUSER_ADDRESS,

					.sv_usrstack	= USRSTACK,

					.sv_psstrings	= PS_STRINGS,

					.sv_psstringssz	= sizeof(struct ps_strings),

					.sv_stackprot	= VM_PROT_ALL,

					.sv_copyout_auxargs = __elfN(freebsd_copyout_auxargs),

					.sv_copyout_strings	= exec_copyout_strings,

									
										sys/i386/linux/linux_sysvec.c
									
		+2
		
												View File
												
				@@ -845,6 +845,7 @@ struct sysentvec linux_sysvec = {

					.sv_maxuser	= VM_MAXUSER_ADDRESS,

					.sv_usrstack	= LINUX_USRSTACK,

					.sv_psstrings	= PS_STRINGS,

					.sv_psstringssz	= sizeof(struct ps_strings),

					.sv_stackprot	= VM_PROT_ALL,

					.sv_copyout_strings = exec_copyout_strings,

					.sv_setregs	= linux_exec_setregs,

				@@ -885,6 +886,7 @@ struct sysentvec elf_linux_sysvec = {

					.sv_maxuser	= VM_MAXUSER_ADDRESS,

					.sv_usrstack	= LINUX_USRSTACK,

					.sv_psstrings	= LINUX_PS_STRINGS,

					.sv_psstringssz	= sizeof(struct ps_strings),

					.sv_stackprot	= VM_PROT_ALL,

					.sv_copyout_auxargs = linux_copyout_auxargs,

					.sv_copyout_strings = linux_copyout_strings,

									
										sys/kern/imgact_aout.c
									
		+2
		
												View File
												
				@@ -89,6 +89,7 @@ struct sysentvec aout_sysvec = {

					.sv_maxuser	= AOUT32_USRSTACK,

					.sv_usrstack	= AOUT32_USRSTACK,

					.sv_psstrings	= AOUT32_PS_STRINGS,

					.sv_psstringssz	= sizeof(struct ps_strings),

					.sv_stackprot	= VM_PROT_ALL,

					.sv_copyout_strings	= exec_copyout_strings,

					.sv_setregs	= exec_setregs,

				@@ -139,6 +140,7 @@ struct sysentvec aout_sysvec = {

					.sv_maxuser	= AOUT32_USRSTACK,

					.sv_usrstack	= AOUT32_USRSTACK,

					.sv_psstrings	= AOUT32_PS_STRINGS,

					.sv_psstringssz	= sizeof(struct freebsd32_ps_strings),

					.sv_stackprot	= VM_PROT_ALL,

					.sv_copyout_strings	= freebsd32_copyout_strings,

					.sv_setregs	= ia32_setregs,

									
										sys/kern/init_main.c
									
		+1
		
												View File
												
				@@ -424,6 +424,7 @@ struct sysentvec null_sysvec = {

					.sv_maxuser	= VM_MAXUSER_ADDRESS,

					.sv_usrstack	= USRSTACK,

					.sv_psstrings	= PS_STRINGS,

					.sv_psstringssz	= sizeof(struct ps_strings),

					.sv_stackprot	= VM_PROT_ALL,

					.sv_copyout_strings	= NULL,

					.sv_setregs	= NULL,

									
										sys/powerpc/powerpc/elf32_machdep.c
									
		+2
		
												View File
												
				@@ -109,6 +109,7 @@ struct sysentvec elf32_freebsd_sysvec = {

					.sv_maxuser	= VM_MAXUSER_ADDRESS32,

					.sv_usrstack	= FREEBSD32_USRSTACK,

					.sv_psstrings	= FREEBSD32_PS_STRINGS,

					.sv_psstringssz	= sizeof(struct freebsd32_ps_strings),

					.sv_copyout_strings = freebsd32_copyout_strings,

					.sv_setregs	= ppc32_setregs,

					.sv_syscallnames = freebsd32_syscallnames,

				@@ -117,6 +118,7 @@ struct sysentvec elf32_freebsd_sysvec = {

					.sv_maxuser	= VM_MAXUSER_ADDRESS,

					.sv_usrstack	= USRSTACK,

					.sv_psstrings	= PS_STRINGS,

					.sv_psstringssz	= sizeof(struct ps_strings),

					.sv_copyout_strings = exec_copyout_strings,

					.sv_setregs	= exec_setregs,

					.sv_syscallnames = syscallnames,

									
										sys/powerpc/powerpc/elf64_machdep.c
									
		+2
		
												View File
												
				@@ -78,6 +78,7 @@ struct sysentvec elf64_freebsd_sysvec_v1 = {

					.sv_maxuser	= VM_MAXUSER_ADDRESS,

					.sv_usrstack	= USRSTACK,

					.sv_psstrings	= PS_STRINGS,

					.sv_psstringssz	= sizeof(struct ps_strings),

					.sv_stackprot	= VM_PROT_ALL,

					.sv_copyout_auxargs = __elfN(powerpc_copyout_auxargs),

					.sv_copyout_strings = exec_copyout_strings,

				@@ -119,6 +120,7 @@ struct sysentvec elf64_freebsd_sysvec_v2 = {

					.sv_maxuser	= VM_MAXUSER_ADDRESS,

					.sv_usrstack	= USRSTACK,

					.sv_psstrings	= PS_STRINGS,

					.sv_psstringssz	= sizeof(struct ps_strings),

					.sv_stackprot	= VM_PROT_ALL,

					.sv_copyout_auxargs = __elfN(powerpc_copyout_auxargs),

					.sv_copyout_strings = exec_copyout_strings,

									
										sys/riscv/riscv/elf_machdep.c
									
		+1
		
												View File
												
				@@ -81,6 +81,7 @@ struct sysentvec elf64_freebsd_sysvec = {

					.sv_maxuser	= VM_MAXUSER_ADDRESS,

					.sv_usrstack	= USRSTACK,

					.sv_psstrings	= PS_STRINGS,

					.sv_psstringssz	= sizeof(struct ps_strings),

					.sv_stackprot	= VM_PROT_READ | VM_PROT_WRITE,

					.sv_copyout_auxargs = __elfN(freebsd_copyout_auxargs),

					.sv_copyout_strings	= exec_copyout_strings,

									
										sys/sys/sysent.h
									
		+1
		
												View File
												
				@@ -128,6 +128,7 @@ struct sysentvec {

					vm_offset_t	sv_maxuser;	/* VM_MAXUSER_ADDRESS */

					vm_offset_t	sv_usrstack;	/* USRSTACK */

					vm_offset_t	sv_psstrings;	/* PS_STRINGS */

					size_t		sv_psstringssz;	/* PS_STRINGS size */

					int		sv_stackprot;	/* vm protection for stack */

					int		(*sv_copyout_strings)(struct image_params *,

							    uintptr_t *);