Differential D7463

Fix getsecs() in loader to return time_t
ClosedPublic
Actions

Authored by stevek on Aug 10 2016, 11:25 PM.

Details

Reviewers

sjg

Group Reviewers

ARM

Commits

rS306159: The getsecs() function is implemented in platform- and bootfw-specific

Summary

The getsecs() function is implemented in platform- and bootfw-specific files and, in a number of these places, there are problems with how they are declared.

Some use int return instead of time_t. On some architectures the bit width of time_t does not naturally fit into an integer and can lead to some unexpected behavior. (For example, 32-bit ARM builds use a 64-bit time_t.)
The function prototypes do not always specify void for the argument list, which can cause some compilers to complain about the prototype.

Test Plan

These changes have been tested on Juniper platforms using loader and ubldr. Specifically, the return type mismatch was causing issues with network installs on ARM platforms using TFTP. The connection would time out pre-maturely, due to incorrect time calculations caused by the bit width mismatch. With the changes (and some additional debug statements to monitor the calculations) and extensive testing, the problem with pre-mature timeout was resolved.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 4753
Build 4807: arc lint + arc unit

Event Timeline

stevek updated this revision to Diff 19189.Aug 10 2016, 11:25 PM

stevek retitled this revision from to Fix getsecs() in loader to return time_t.

stevek updated this object.

stevek edited the test plan for this revision. (Show Details)

stevek added a reviewer: ARM.

Herald added a subscriber: imp. · View Herald TranscriptAug 10 2016, 11:25 PM

stevek updated this object.Aug 10 2016, 11:27 PM

stevek edited the test plan for this revision. (Show Details)

thanks

This revision is now accepted and ready to land.Aug 23 2016, 4:34 PM

Closed by commit rS306159: The getsecs() function is implemented in platform- and bootfw-specific (authored by stevek). · Explain WhySep 22 2016, 6:24 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

sys/

boot/

efi/

libefi/

time.c

2 lines

time_event.c

2 lines

i386/

libi386/

pxe.c

2 lines

ofw/

libofw/

ofw_time.c

4 lines

powerpc/

kboot/

main.c

4 lines

ps3/

main.c

6 lines

uboot/

lib/

time.c

2 lines

Diff 19189

View Options

sys/boot/efi/libefi/time.c

Show First 20 Lines • Show All 939 Lines • ▼ Show 20 Lines	if (interp[interp_name_len - 1] != '\0') {
return (ENOEXEC);		return (ENOEXEC);
}		}

*interpp = interp;		*interpp = interp;
*free_interpp = false;		*free_interpp = false;
return (0);		return (0);
}		}

		static int
		__elfN(load_interp)(struct image_params imgp, const Elf_Brandinfo brand_info,
		const char interp, u_long addr, u_long *entry)
		{
		char *path;
		int error;

		if (brand_info->emul_path != NULL &&
		brand_info->emul_path[0] != '\0') {
		path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
		snprintf(path, MAXPATHLEN, "%s%s",
		brand_info->emul_path, interp);
		error = __elfN(load_file)(imgp->proc, path, addr, entry);
		free(path, M_TEMP);
		kibUnsubmitted Not Done Inline Actions This block of if() can be naturally moved before calculating newinterp. kib: This block of if() can be naturally moved before calculating newinterp.
		if (error == 0)
		return (0);
		}

		if (brand_info->interp_newpath != NULL &&
		(brand_info->interp_path == NULL \|\|
		strcmp(interp, brand_info->interp_path) == 0)) {
		error = __elfN(load_file)(imgp->proc,
		brand_info->interp_newpath, addr, entry);
		if (error == 0)
		kibUnsubmitted Not Done Inline Actions How could newinterp != NULL and brand_info->interp_path == NULL ? kib: How could newinterp != NULL and brand_info->interp_path == NULL ?
		traszAuthorUnsubmitted Done Inline Actions The newinterp comes from brand_info->interp_newpath, not brand_info->interp_path. trasz: The newinterp comes from brand_info->interp_newpath, not brand_info->interp_path.
		return (0);
		}

		error = __elfN(load_file)(imgp->proc, interp, addr, entry);
		if (error == 0)
		return (0);

		uprintf("ELF interpreter %s not found, error %d\n", interp, error);
		return (error);
		}
		kibUnsubmitted Done Inline Actions This block is irrelevant for the task of loading the interpreter. I must not be moved. kib: This block is irrelevant for the task of loading the interpreter. I must not be moved.

/*		/*
* Impossible et_dyn_addr initial value indicating that the real base		* Impossible et_dyn_addr initial value indicating that the real base
* must be calculated later with some randomization applied.		* must be calculated later with some randomization applied.
*/		*/
#define ET_DYN_ADDR_RAND 1		#define ET_DYN_ADDR_RAND 1

static int		static int
__CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)		__CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)
{		{
struct thread *td;		struct thread *td;
const Elf_Ehdr *hdr;		const Elf_Ehdr *hdr;
const Elf_Phdr *phdr;		const Elf_Phdr *phdr;
Elf_Auxargs *elf_auxargs;		Elf_Auxargs *elf_auxargs;
struct vmspace *vmspace;		struct vmspace *vmspace;
vm_map_t map;		vm_map_t map;
const char *newinterp;		char *interp;
char interp, path;
Elf_Brandinfo *brand_info;		Elf_Brandinfo *brand_info;
struct sysentvec *sv;		struct sysentvec *sv;
vm_prot_t prot;		vm_prot_t prot;
u_long addr, baddr, et_dyn_addr, entry, proghdr;		u_long addr, baddr, et_dyn_addr, entry, proghdr;
u_long maxalign, mapsz, maxv, maxv1;		u_long maxalign, mapsz, maxv, maxv1;
uint32_t fctl0;		uint32_t fctl0;
int32_t osrel;		int32_t osrel;
bool free_interp;		bool free_interp;
int error, i, n, have_interp;		int error, i, n;

hdr = (const Elf_Ehdr *)imgp->image_header;		hdr = (const Elf_Ehdr *)imgp->image_header;

/*		/*
* Do we have a valid ELF header ?		* Do we have a valid ELF header ?
*		*
* Only allow ET_EXEC & ET_DYN here, reject ET_DYN later		* Only allow ET_EXEC & ET_DYN here, reject ET_DYN later
* if particular brand doesn't support it.		* if particular brand doesn't support it.
Show All 19 Lines	if (!aligned(phdr, Elf_Addr)) {
return (ENOEXEC);		return (ENOEXEC);
}		}

n = error = 0;		n = error = 0;
baddr = 0;		baddr = 0;
osrel = 0;		osrel = 0;
fctl0 = 0;		fctl0 = 0;
entry = proghdr = 0;		entry = proghdr = 0;
newinterp = interp = NULL;		interp = NULL;
free_interp = false;		free_interp = false;
td = curthread;		td = curthread;
maxalign = PAGE_SIZE;		maxalign = PAGE_SIZE;
mapsz = 0;		mapsz = 0;

for (i = 0; i < hdr->e_phnum; i++) {		for (i = 0; i < hdr->e_phnum; i++) {
switch (phdr[i].p_type) {		switch (phdr[i].p_type) {
case PT_LOAD:		case PT_LOAD:
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines	if (baddr == 0) {
else if ((__elfN(pie_aslr_enabled) &&		else if ((__elfN(pie_aslr_enabled) &&
(imgp->proc->p_flag2 & P2_ASLR_DISABLE) == 0) \|\|		(imgp->proc->p_flag2 & P2_ASLR_DISABLE) == 0) \|\|
(imgp->proc->p_flag2 & P2_ASLR_ENABLE) != 0)		(imgp->proc->p_flag2 & P2_ASLR_ENABLE) != 0)
et_dyn_addr = ET_DYN_ADDR_RAND;		et_dyn_addr = ET_DYN_ADDR_RAND;
else		else
et_dyn_addr = ET_DYN_LOAD_ADDR;		et_dyn_addr = ET_DYN_LOAD_ADDR;
}		}
}		}
if (interp != NULL && brand_info->interp_newpath != NULL)
newinterp = brand_info->interp_newpath;

/*		/*
* Avoid a possible deadlock if the current address space is destroyed		* Avoid a possible deadlock if the current address space is destroyed
* and that address space maps the locked vnode. In the common case,		* and that address space maps the locked vnode. In the common case,
* the locked vnode's v_usecount is decremented but remains greater		* the locked vnode's v_usecount is decremented but remains greater
* than zero. Consequently, the vnode lock is not needed by vrele().		* than zero. Consequently, the vnode lock is not needed by vrele().
* However, in cases where the vnode lock is external, such as nullfs,		* However, in cases where the vnode lock is external, such as nullfs,
* v_usecount may become zero.		* v_usecount may become zero.
▲ Show 20 Lines • Show All 108 Lines • ▼ Show 20 Lines	map->anon_loc = __CONCAT(rnd_, __elfN(base))(map, addr, maxv1,
MAXPAGESIZES > 1 ? pagesizes[1] : pagesizes[0]);		MAXPAGESIZES > 1 ? pagesizes[1] : pagesizes[0]);
} else {		} else {
map->anon_loc = addr;		map->anon_loc = addr;
}		}

imgp->entry_addr = entry;		imgp->entry_addr = entry;

if (interp != NULL) {		if (interp != NULL) {
have_interp = FALSE;
VOP_UNLOCK(imgp->vp, 0);		VOP_UNLOCK(imgp->vp, 0);
if ((map->flags & MAP_ASLR) != 0) {		if ((map->flags & MAP_ASLR) != 0) {
/* Assume that interpeter fits into 1/4 of AS */		/* Assume that interpeter fits into 1/4 of AS */
maxv1 = maxv / 2 + addr / 2;		maxv1 = maxv / 2 + addr / 2;
MPASS(maxv1 >= addr); /* No overflow */		MPASS(maxv1 >= addr); /* No overflow */
addr = __CONCAT(rnd_, __elfN(base))(map, addr,		addr = __CONCAT(rnd_, __elfN(base))(map, addr,
maxv1, PAGE_SIZE);		maxv1, PAGE_SIZE);
}		}
if (brand_info->emul_path != NULL &&		error = __elfN(load_interp)(imgp, brand_info, interp, &addr,
brand_info->emul_path[0] != '\0') {
path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
snprintf(path, MAXPATHLEN, "%s%s",
brand_info->emul_path, interp);
error = __elfN(load_file)(imgp->proc, path, &addr,
&imgp->entry_addr);		&imgp->entry_addr);
free(path, M_TEMP);
if (error == 0)
have_interp = TRUE;
}
if (!have_interp && newinterp != NULL &&
(brand_info->interp_path == NULL \|\|
strcmp(interp, brand_info->interp_path) == 0)) {
error = __elfN(load_file)(imgp->proc, newinterp, &addr,
&imgp->entry_addr);
if (error == 0)
have_interp = TRUE;
}
if (!have_interp) {
error = __elfN(load_file)(imgp->proc, interp, &addr,
&imgp->entry_addr);
}
vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);		vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);
if (error != 0) {		if (error != 0)
uprintf("ELF interpreter %s not found, error %d\n",
interp, error);
goto ret;		goto ret;
}
} else		} else
addr = et_dyn_addr;		addr = et_dyn_addr;

/*		/*
* Construct auxargs table (used by the fixup routine)		* Construct auxargs table (used by the fixup routine)
*/		*/
elf_auxargs = malloc(sizeof(Elf_Auxargs), M_TEMP, M_WAITOK);		elf_auxargs = malloc(sizeof(Elf_Auxargs), M_TEMP, M_WAITOK);
elf_auxargs->execfd = -1;		elf_auxargs->execfd = -1;
▲ Show 20 Lines • Show All 1,456 Lines • Show Last 20 Lines

View Options

sys/boot/efi/libefi/time_event.c

Show First 20 Lines • Show All 939 Lines • ▼ Show 20 Lines	if (interp[interp_name_len - 1] != '\0') {
return (ENOEXEC);		return (ENOEXEC);
}		}

*interpp = interp;		*interpp = interp;
*free_interpp = false;		*free_interpp = false;
return (0);		return (0);
}		}

		static int
		__elfN(load_interp)(struct image_params imgp, const Elf_Brandinfo brand_info,
		const char interp, u_long addr, u_long *entry)
		{
		char *path;
		int error;

		if (brand_info->emul_path != NULL &&
		brand_info->emul_path[0] != '\0') {
		path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
		snprintf(path, MAXPATHLEN, "%s%s",
		brand_info->emul_path, interp);
		error = __elfN(load_file)(imgp->proc, path, addr, entry);
		free(path, M_TEMP);
		kibUnsubmitted Not Done Inline Actions This block of if() can be naturally moved before calculating newinterp. kib: This block of if() can be naturally moved before calculating newinterp.
		if (error == 0)
		return (0);
		}

		if (brand_info->interp_newpath != NULL &&
		(brand_info->interp_path == NULL \|\|
		strcmp(interp, brand_info->interp_path) == 0)) {
		error = __elfN(load_file)(imgp->proc,
		brand_info->interp_newpath, addr, entry);
		if (error == 0)
		kibUnsubmitted Not Done Inline Actions How could newinterp != NULL and brand_info->interp_path == NULL ? kib: How could newinterp != NULL and brand_info->interp_path == NULL ?
		traszAuthorUnsubmitted Done Inline Actions The newinterp comes from brand_info->interp_newpath, not brand_info->interp_path. trasz: The newinterp comes from brand_info->interp_newpath, not brand_info->interp_path.
		return (0);
		}

		error = __elfN(load_file)(imgp->proc, interp, addr, entry);
		if (error == 0)
		return (0);

		uprintf("ELF interpreter %s not found, error %d\n", interp, error);
		return (error);
		}
		kibUnsubmitted Done Inline Actions This block is irrelevant for the task of loading the interpreter. I must not be moved. kib: This block is irrelevant for the task of loading the interpreter. I must not be moved.

/*		/*
* Impossible et_dyn_addr initial value indicating that the real base		* Impossible et_dyn_addr initial value indicating that the real base
* must be calculated later with some randomization applied.		* must be calculated later with some randomization applied.
*/		*/
#define ET_DYN_ADDR_RAND 1		#define ET_DYN_ADDR_RAND 1

static int		static int
__CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)		__CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)
{		{
struct thread *td;		struct thread *td;
const Elf_Ehdr *hdr;		const Elf_Ehdr *hdr;
const Elf_Phdr *phdr;		const Elf_Phdr *phdr;
Elf_Auxargs *elf_auxargs;		Elf_Auxargs *elf_auxargs;
struct vmspace *vmspace;		struct vmspace *vmspace;
vm_map_t map;		vm_map_t map;
const char *newinterp;		char *interp;
char interp, path;
Elf_Brandinfo *brand_info;		Elf_Brandinfo *brand_info;
struct sysentvec *sv;		struct sysentvec *sv;
vm_prot_t prot;		vm_prot_t prot;
u_long addr, baddr, et_dyn_addr, entry, proghdr;		u_long addr, baddr, et_dyn_addr, entry, proghdr;
u_long maxalign, mapsz, maxv, maxv1;		u_long maxalign, mapsz, maxv, maxv1;
uint32_t fctl0;		uint32_t fctl0;
int32_t osrel;		int32_t osrel;
bool free_interp;		bool free_interp;
int error, i, n, have_interp;		int error, i, n;

hdr = (const Elf_Ehdr *)imgp->image_header;		hdr = (const Elf_Ehdr *)imgp->image_header;

/*		/*
* Do we have a valid ELF header ?		* Do we have a valid ELF header ?
*		*
* Only allow ET_EXEC & ET_DYN here, reject ET_DYN later		* Only allow ET_EXEC & ET_DYN here, reject ET_DYN later
* if particular brand doesn't support it.		* if particular brand doesn't support it.
Show All 19 Lines	if (!aligned(phdr, Elf_Addr)) {
return (ENOEXEC);		return (ENOEXEC);
}		}

n = error = 0;		n = error = 0;
baddr = 0;		baddr = 0;
osrel = 0;		osrel = 0;
fctl0 = 0;		fctl0 = 0;
entry = proghdr = 0;		entry = proghdr = 0;
newinterp = interp = NULL;		interp = NULL;
free_interp = false;		free_interp = false;
td = curthread;		td = curthread;
maxalign = PAGE_SIZE;		maxalign = PAGE_SIZE;
mapsz = 0;		mapsz = 0;

for (i = 0; i < hdr->e_phnum; i++) {		for (i = 0; i < hdr->e_phnum; i++) {
switch (phdr[i].p_type) {		switch (phdr[i].p_type) {
case PT_LOAD:		case PT_LOAD:
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines	if (baddr == 0) {
else if ((__elfN(pie_aslr_enabled) &&		else if ((__elfN(pie_aslr_enabled) &&
(imgp->proc->p_flag2 & P2_ASLR_DISABLE) == 0) \|\|		(imgp->proc->p_flag2 & P2_ASLR_DISABLE) == 0) \|\|
(imgp->proc->p_flag2 & P2_ASLR_ENABLE) != 0)		(imgp->proc->p_flag2 & P2_ASLR_ENABLE) != 0)
et_dyn_addr = ET_DYN_ADDR_RAND;		et_dyn_addr = ET_DYN_ADDR_RAND;
else		else
et_dyn_addr = ET_DYN_LOAD_ADDR;		et_dyn_addr = ET_DYN_LOAD_ADDR;
}		}
}		}
if (interp != NULL && brand_info->interp_newpath != NULL)
newinterp = brand_info->interp_newpath;

/*		/*
* Avoid a possible deadlock if the current address space is destroyed		* Avoid a possible deadlock if the current address space is destroyed
* and that address space maps the locked vnode. In the common case,		* and that address space maps the locked vnode. In the common case,
* the locked vnode's v_usecount is decremented but remains greater		* the locked vnode's v_usecount is decremented but remains greater
* than zero. Consequently, the vnode lock is not needed by vrele().		* than zero. Consequently, the vnode lock is not needed by vrele().
* However, in cases where the vnode lock is external, such as nullfs,		* However, in cases where the vnode lock is external, such as nullfs,
* v_usecount may become zero.		* v_usecount may become zero.
▲ Show 20 Lines • Show All 108 Lines • ▼ Show 20 Lines	map->anon_loc = __CONCAT(rnd_, __elfN(base))(map, addr, maxv1,
MAXPAGESIZES > 1 ? pagesizes[1] : pagesizes[0]);		MAXPAGESIZES > 1 ? pagesizes[1] : pagesizes[0]);
} else {		} else {
map->anon_loc = addr;		map->anon_loc = addr;
}		}

imgp->entry_addr = entry;		imgp->entry_addr = entry;

if (interp != NULL) {		if (interp != NULL) {
have_interp = FALSE;
VOP_UNLOCK(imgp->vp, 0);		VOP_UNLOCK(imgp->vp, 0);
if ((map->flags & MAP_ASLR) != 0) {		if ((map->flags & MAP_ASLR) != 0) {
/* Assume that interpeter fits into 1/4 of AS */		/* Assume that interpeter fits into 1/4 of AS */
maxv1 = maxv / 2 + addr / 2;		maxv1 = maxv / 2 + addr / 2;
MPASS(maxv1 >= addr); /* No overflow */		MPASS(maxv1 >= addr); /* No overflow */
addr = __CONCAT(rnd_, __elfN(base))(map, addr,		addr = __CONCAT(rnd_, __elfN(base))(map, addr,
maxv1, PAGE_SIZE);		maxv1, PAGE_SIZE);
}		}
if (brand_info->emul_path != NULL &&		error = __elfN(load_interp)(imgp, brand_info, interp, &addr,
brand_info->emul_path[0] != '\0') {
path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
snprintf(path, MAXPATHLEN, "%s%s",
brand_info->emul_path, interp);
error = __elfN(load_file)(imgp->proc, path, &addr,
&imgp->entry_addr);		&imgp->entry_addr);
free(path, M_TEMP);
if (error == 0)
have_interp = TRUE;
}
if (!have_interp && newinterp != NULL &&
(brand_info->interp_path == NULL \|\|
strcmp(interp, brand_info->interp_path) == 0)) {
error = __elfN(load_file)(imgp->proc, newinterp, &addr,
&imgp->entry_addr);
if (error == 0)
have_interp = TRUE;
}
if (!have_interp) {
error = __elfN(load_file)(imgp->proc, interp, &addr,
&imgp->entry_addr);
}
vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);		vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);
if (error != 0) {		if (error != 0)
uprintf("ELF interpreter %s not found, error %d\n",
interp, error);
goto ret;		goto ret;
}
} else		} else
addr = et_dyn_addr;		addr = et_dyn_addr;

/*		/*
* Construct auxargs table (used by the fixup routine)		* Construct auxargs table (used by the fixup routine)
*/		*/
elf_auxargs = malloc(sizeof(Elf_Auxargs), M_TEMP, M_WAITOK);		elf_auxargs = malloc(sizeof(Elf_Auxargs), M_TEMP, M_WAITOK);
elf_auxargs->execfd = -1;		elf_auxargs->execfd = -1;
▲ Show 20 Lines • Show All 1,456 Lines • Show Last 20 Lines

View Options

sys/boot/i386/libi386/pxe.c

Show First 20 Lines • Show All 939 Lines • ▼ Show 20 Lines	if (interp[interp_name_len - 1] != '\0') {
return (ENOEXEC);		return (ENOEXEC);
}		}

*interpp = interp;		*interpp = interp;
*free_interpp = false;		*free_interpp = false;
return (0);		return (0);
}		}

		static int
		__elfN(load_interp)(struct image_params imgp, const Elf_Brandinfo brand_info,
		const char interp, u_long addr, u_long *entry)
		{
		char *path;
		int error;

		if (brand_info->emul_path != NULL &&
		brand_info->emul_path[0] != '\0') {
		path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
		snprintf(path, MAXPATHLEN, "%s%s",
		brand_info->emul_path, interp);
		error = __elfN(load_file)(imgp->proc, path, addr, entry);
		free(path, M_TEMP);
		kibUnsubmitted Not Done Inline Actions This block of if() can be naturally moved before calculating newinterp. kib: This block of if() can be naturally moved before calculating newinterp.
		if (error == 0)
		return (0);
		}

		if (brand_info->interp_newpath != NULL &&
		(brand_info->interp_path == NULL \|\|
		strcmp(interp, brand_info->interp_path) == 0)) {
		error = __elfN(load_file)(imgp->proc,
		brand_info->interp_newpath, addr, entry);
		if (error == 0)
		kibUnsubmitted Not Done Inline Actions How could newinterp != NULL and brand_info->interp_path == NULL ? kib: How could newinterp != NULL and brand_info->interp_path == NULL ?
		traszAuthorUnsubmitted Done Inline Actions The newinterp comes from brand_info->interp_newpath, not brand_info->interp_path. trasz: The newinterp comes from brand_info->interp_newpath, not brand_info->interp_path.
		return (0);
		}

		error = __elfN(load_file)(imgp->proc, interp, addr, entry);
		if (error == 0)
		return (0);

		uprintf("ELF interpreter %s not found, error %d\n", interp, error);
		return (error);
		}
		kibUnsubmitted Done Inline Actions This block is irrelevant for the task of loading the interpreter. I must not be moved. kib: This block is irrelevant for the task of loading the interpreter. I must not be moved.

/*		/*
* Impossible et_dyn_addr initial value indicating that the real base		* Impossible et_dyn_addr initial value indicating that the real base
* must be calculated later with some randomization applied.		* must be calculated later with some randomization applied.
*/		*/
#define ET_DYN_ADDR_RAND 1		#define ET_DYN_ADDR_RAND 1

static int		static int
__CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)		__CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)
{		{
struct thread *td;		struct thread *td;
const Elf_Ehdr *hdr;		const Elf_Ehdr *hdr;
const Elf_Phdr *phdr;		const Elf_Phdr *phdr;
Elf_Auxargs *elf_auxargs;		Elf_Auxargs *elf_auxargs;
struct vmspace *vmspace;		struct vmspace *vmspace;
vm_map_t map;		vm_map_t map;
const char *newinterp;		char *interp;
char interp, path;
Elf_Brandinfo *brand_info;		Elf_Brandinfo *brand_info;
struct sysentvec *sv;		struct sysentvec *sv;
vm_prot_t prot;		vm_prot_t prot;
u_long addr, baddr, et_dyn_addr, entry, proghdr;		u_long addr, baddr, et_dyn_addr, entry, proghdr;
u_long maxalign, mapsz, maxv, maxv1;		u_long maxalign, mapsz, maxv, maxv1;
uint32_t fctl0;		uint32_t fctl0;
int32_t osrel;		int32_t osrel;
bool free_interp;		bool free_interp;
int error, i, n, have_interp;		int error, i, n;

hdr = (const Elf_Ehdr *)imgp->image_header;		hdr = (const Elf_Ehdr *)imgp->image_header;

/*		/*
* Do we have a valid ELF header ?		* Do we have a valid ELF header ?
*		*
* Only allow ET_EXEC & ET_DYN here, reject ET_DYN later		* Only allow ET_EXEC & ET_DYN here, reject ET_DYN later
* if particular brand doesn't support it.		* if particular brand doesn't support it.
Show All 19 Lines	if (!aligned(phdr, Elf_Addr)) {
return (ENOEXEC);		return (ENOEXEC);
}		}

n = error = 0;		n = error = 0;
baddr = 0;		baddr = 0;
osrel = 0;		osrel = 0;
fctl0 = 0;		fctl0 = 0;
entry = proghdr = 0;		entry = proghdr = 0;
newinterp = interp = NULL;		interp = NULL;
free_interp = false;		free_interp = false;
td = curthread;		td = curthread;
maxalign = PAGE_SIZE;		maxalign = PAGE_SIZE;
mapsz = 0;		mapsz = 0;

for (i = 0; i < hdr->e_phnum; i++) {		for (i = 0; i < hdr->e_phnum; i++) {
switch (phdr[i].p_type) {		switch (phdr[i].p_type) {
case PT_LOAD:		case PT_LOAD:
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines	if (baddr == 0) {
else if ((__elfN(pie_aslr_enabled) &&		else if ((__elfN(pie_aslr_enabled) &&
(imgp->proc->p_flag2 & P2_ASLR_DISABLE) == 0) \|\|		(imgp->proc->p_flag2 & P2_ASLR_DISABLE) == 0) \|\|
(imgp->proc->p_flag2 & P2_ASLR_ENABLE) != 0)		(imgp->proc->p_flag2 & P2_ASLR_ENABLE) != 0)
et_dyn_addr = ET_DYN_ADDR_RAND;		et_dyn_addr = ET_DYN_ADDR_RAND;
else		else
et_dyn_addr = ET_DYN_LOAD_ADDR;		et_dyn_addr = ET_DYN_LOAD_ADDR;
}		}
}		}
if (interp != NULL && brand_info->interp_newpath != NULL)
newinterp = brand_info->interp_newpath;

/*		/*
* Avoid a possible deadlock if the current address space is destroyed		* Avoid a possible deadlock if the current address space is destroyed
* and that address space maps the locked vnode. In the common case,		* and that address space maps the locked vnode. In the common case,
* the locked vnode's v_usecount is decremented but remains greater		* the locked vnode's v_usecount is decremented but remains greater
* than zero. Consequently, the vnode lock is not needed by vrele().		* than zero. Consequently, the vnode lock is not needed by vrele().
* However, in cases where the vnode lock is external, such as nullfs,		* However, in cases where the vnode lock is external, such as nullfs,
* v_usecount may become zero.		* v_usecount may become zero.
▲ Show 20 Lines • Show All 108 Lines • ▼ Show 20 Lines	map->anon_loc = __CONCAT(rnd_, __elfN(base))(map, addr, maxv1,
MAXPAGESIZES > 1 ? pagesizes[1] : pagesizes[0]);		MAXPAGESIZES > 1 ? pagesizes[1] : pagesizes[0]);
} else {		} else {
map->anon_loc = addr;		map->anon_loc = addr;
}		}

imgp->entry_addr = entry;		imgp->entry_addr = entry;

if (interp != NULL) {		if (interp != NULL) {
have_interp = FALSE;
VOP_UNLOCK(imgp->vp, 0);		VOP_UNLOCK(imgp->vp, 0);
if ((map->flags & MAP_ASLR) != 0) {		if ((map->flags & MAP_ASLR) != 0) {
/* Assume that interpeter fits into 1/4 of AS */		/* Assume that interpeter fits into 1/4 of AS */
maxv1 = maxv / 2 + addr / 2;		maxv1 = maxv / 2 + addr / 2;
MPASS(maxv1 >= addr); /* No overflow */		MPASS(maxv1 >= addr); /* No overflow */
addr = __CONCAT(rnd_, __elfN(base))(map, addr,		addr = __CONCAT(rnd_, __elfN(base))(map, addr,
maxv1, PAGE_SIZE);		maxv1, PAGE_SIZE);
}		}
if (brand_info->emul_path != NULL &&		error = __elfN(load_interp)(imgp, brand_info, interp, &addr,
brand_info->emul_path[0] != '\0') {
path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
snprintf(path, MAXPATHLEN, "%s%s",
brand_info->emul_path, interp);
error = __elfN(load_file)(imgp->proc, path, &addr,
&imgp->entry_addr);		&imgp->entry_addr);
free(path, M_TEMP);
if (error == 0)
have_interp = TRUE;
}
if (!have_interp && newinterp != NULL &&
(brand_info->interp_path == NULL \|\|
strcmp(interp, brand_info->interp_path) == 0)) {
error = __elfN(load_file)(imgp->proc, newinterp, &addr,
&imgp->entry_addr);
if (error == 0)
have_interp = TRUE;
}
if (!have_interp) {
error = __elfN(load_file)(imgp->proc, interp, &addr,
&imgp->entry_addr);
}
vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);		vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);
if (error != 0) {		if (error != 0)
uprintf("ELF interpreter %s not found, error %d\n",
interp, error);
goto ret;		goto ret;
}
} else		} else
addr = et_dyn_addr;		addr = et_dyn_addr;

/*		/*
* Construct auxargs table (used by the fixup routine)		* Construct auxargs table (used by the fixup routine)
*/		*/
elf_auxargs = malloc(sizeof(Elf_Auxargs), M_TEMP, M_WAITOK);		elf_auxargs = malloc(sizeof(Elf_Auxargs), M_TEMP, M_WAITOK);
elf_auxargs->execfd = -1;		elf_auxargs->execfd = -1;
▲ Show 20 Lines • Show All 1,456 Lines • Show Last 20 Lines

View Options

sys/boot/ofw/libofw/ofw_time.c

Show First 20 Lines • Show All 939 Lines • ▼ Show 20 Lines	if (interp[interp_name_len - 1] != '\0') {
return (ENOEXEC);		return (ENOEXEC);
}		}

*interpp = interp;		*interpp = interp;
*free_interpp = false;		*free_interpp = false;
return (0);		return (0);
}		}

		static int
		__elfN(load_interp)(struct image_params imgp, const Elf_Brandinfo brand_info,
		const char interp, u_long addr, u_long *entry)
		{
		char *path;
		int error;

		if (brand_info->emul_path != NULL &&
		brand_info->emul_path[0] != '\0') {
		path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
		snprintf(path, MAXPATHLEN, "%s%s",
		brand_info->emul_path, interp);
		error = __elfN(load_file)(imgp->proc, path, addr, entry);
		free(path, M_TEMP);
		kibUnsubmitted Not Done Inline Actions This block of if() can be naturally moved before calculating newinterp. kib: This block of if() can be naturally moved before calculating newinterp.
		if (error == 0)
		return (0);
		}

		if (brand_info->interp_newpath != NULL &&
		(brand_info->interp_path == NULL \|\|
		strcmp(interp, brand_info->interp_path) == 0)) {
		error = __elfN(load_file)(imgp->proc,
		brand_info->interp_newpath, addr, entry);
		if (error == 0)
		kibUnsubmitted Not Done Inline Actions How could newinterp != NULL and brand_info->interp_path == NULL ? kib: How could newinterp != NULL and brand_info->interp_path == NULL ?
		traszAuthorUnsubmitted Done Inline Actions The newinterp comes from brand_info->interp_newpath, not brand_info->interp_path. trasz: The newinterp comes from brand_info->interp_newpath, not brand_info->interp_path.
		return (0);
		}

		error = __elfN(load_file)(imgp->proc, interp, addr, entry);
		if (error == 0)
		return (0);

		uprintf("ELF interpreter %s not found, error %d\n", interp, error);
		return (error);
		}
		kibUnsubmitted Done Inline Actions This block is irrelevant for the task of loading the interpreter. I must not be moved. kib: This block is irrelevant for the task of loading the interpreter. I must not be moved.

/*		/*
* Impossible et_dyn_addr initial value indicating that the real base		* Impossible et_dyn_addr initial value indicating that the real base
* must be calculated later with some randomization applied.		* must be calculated later with some randomization applied.
*/		*/
#define ET_DYN_ADDR_RAND 1		#define ET_DYN_ADDR_RAND 1

static int		static int
__CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)		__CONCAT(exec_, __elfN(imgact))(struct image_params *imgp)
{		{
struct thread *td;		struct thread *td;
const Elf_Ehdr *hdr;		const Elf_Ehdr *hdr;
const Elf_Phdr *phdr;		const Elf_Phdr *phdr;
Elf_Auxargs *elf_auxargs;		Elf_Auxargs *elf_auxargs;
struct vmspace *vmspace;		struct vmspace *vmspace;
vm_map_t map;		vm_map_t map;
const char *newinterp;		char *interp;
char interp, path;
Elf_Brandinfo *brand_info;		Elf_Brandinfo *brand_info;
struct sysentvec *sv;		struct sysentvec *sv;
vm_prot_t prot;		vm_prot_t prot;
u_long addr, baddr, et_dyn_addr, entry, proghdr;		u_long addr, baddr, et_dyn_addr, entry, proghdr;
u_long maxalign, mapsz, maxv, maxv1;		u_long maxalign, mapsz, maxv, maxv1;
uint32_t fctl0;		uint32_t fctl0;
int32_t osrel;		int32_t osrel;
bool free_interp;		bool free_interp;
int error, i, n, have_interp;		int error, i, n;

hdr = (const Elf_Ehdr *)imgp->image_header;		hdr = (const Elf_Ehdr *)imgp->image_header;

/*		/*
* Do we have a valid ELF header ?		* Do we have a valid ELF header ?
*		*
* Only allow ET_EXEC & ET_DYN here, reject ET_DYN later		* Only allow ET_EXEC & ET_DYN here, reject ET_DYN later
* if particular brand doesn't support it.		* if particular brand doesn't support it.
Show All 19 Lines	if (!aligned(phdr, Elf_Addr)) {
return (ENOEXEC);		return (ENOEXEC);
}		}

n = error = 0;		n = error = 0;
baddr = 0;		baddr = 0;
osrel = 0;		osrel = 0;
fctl0 = 0;		fctl0 = 0;
entry = proghdr = 0;		entry = proghdr = 0;
newinterp = interp = NULL;		interp = NULL;
free_interp = false;		free_interp = false;
td = curthread;		td = curthread;
maxalign = PAGE_SIZE;		maxalign = PAGE_SIZE;
mapsz = 0;		mapsz = 0;

for (i = 0; i < hdr->e_phnum; i++) {		for (i = 0; i < hdr->e_phnum; i++) {
switch (phdr[i].p_type) {		switch (phdr[i].p_type) {
case PT_LOAD:		case PT_LOAD:
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines	if (baddr == 0) {
else if ((__elfN(pie_aslr_enabled) &&		else if ((__elfN(pie_aslr_enabled) &&
(imgp->proc->p_flag2 & P2_ASLR_DISABLE) == 0) \|\|		(imgp->proc->p_flag2 & P2_ASLR_DISABLE) == 0) \|\|
(imgp->proc->p_flag2 & P2_ASLR_ENABLE) != 0)		(imgp->proc->p_flag2 & P2_ASLR_ENABLE) != 0)
et_dyn_addr = ET_DYN_ADDR_RAND;		et_dyn_addr = ET_DYN_ADDR_RAND;
else		else
et_dyn_addr = ET_DYN_LOAD_ADDR;		et_dyn_addr = ET_DYN_LOAD_ADDR;
}		}
}		}
if (interp != NULL && brand_info->interp_newpath != NULL)
newinterp = brand_info->interp_newpath;

/*		/*
* Avoid a possible deadlock if the current address space is destroyed		* Avoid a possible deadlock if the current address space is destroyed
* and that address space maps the locked vnode. In the common case,		* and that address space maps the locked vnode. In the common case,
* the locked vnode's v_usecount is decremented but remains greater		* the locked vnode's v_usecount is decremented but remains greater
* than zero. Consequently, the vnode lock is not needed by vrele().		* than zero. Consequently, the vnode lock is not needed by vrele().
* However, in cases where the vnode lock is external, such as nullfs,		* However, in cases where the vnode lock is external, such as nullfs,
* v_usecount may become zero.		* v_usecount may become zero.
▲ Show 20 Lines • Show All 108 Lines • ▼ Show 20 Lines	map->anon_loc = __CONCAT(rnd_, __elfN(base))(map, addr, maxv1,
MAXPAGESIZES > 1 ? pagesizes[1] : pagesizes[0]);		MAXPAGESIZES > 1 ? pagesizes[1] : pagesizes[0]);
} else {		} else {
map->anon_loc = addr;		map->anon_loc = addr;
}		}

imgp->entry_addr = entry;		imgp->entry_addr = entry;

if (interp != NULL) {		if (interp != NULL) {
have_interp = FALSE;
VOP_UNLOCK(imgp->vp, 0);		VOP_UNLOCK(imgp->vp, 0);
if ((map->flags & MAP_ASLR) != 0) {		if ((map->flags & MAP_ASLR) != 0) {
/* Assume that interpeter fits into 1/4 of AS */		/* Assume that interpeter fits into 1/4 of AS */
maxv1 = maxv / 2 + addr / 2;		maxv1 = maxv / 2 + addr / 2;
MPASS(maxv1 >= addr); /* No overflow */		MPASS(maxv1 >= addr); /* No overflow */
addr = __CONCAT(rnd_, __elfN(base))(map, addr,		addr = __CONCAT(rnd_, __elfN(base))(map, addr,
maxv1, PAGE_SIZE);		maxv1, PAGE_SIZE);
}		}
if (brand_info->emul_path != NULL &&		error = __elfN(load_interp)(imgp, brand_info, interp, &addr,
brand_info->emul_path[0] != '\0') {
path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
snprintf(path, MAXPATHLEN, "%s%s",
brand_info->emul_path, interp);
error = __elfN(load_file)(imgp->proc, path, &addr,
&imgp->entry_addr);		&imgp->entry_addr);
free(path, M_TEMP);
if (error == 0)
have_interp = TRUE;
}
if (!have_interp && newinterp != NULL &&
(brand_info->interp_path == NULL \|\|
strcmp(interp, brand_info->interp_path) == 0)) {
error = __elfN(load_file)(imgp->proc, newinterp, &addr,
&imgp->entry_addr);
if (error == 0)
have_interp = TRUE;
}
if (!have_interp) {
error = __elfN(load_file)(imgp->proc, interp, &addr,
&imgp->entry_addr);
}
vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);		vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);
if (error != 0) {		if (error != 0)
uprintf("ELF interpreter %s not found, error %d\n",
interp, error);
goto ret;		goto ret;
}
} else		} else
addr = et_dyn_addr;		addr = et_dyn_addr;

/*		/*
* Construct auxargs table (used by the fixup routine)		* Construct auxargs table (used by the fixup routine)
*/		*/
elf_auxargs = malloc(sizeof(Elf_Auxargs), M_TEMP, M_WAITOK);		elf_auxargs = malloc(sizeof(Elf_Auxargs), M_TEMP, M_WAITOK);
elf_auxargs->execfd = -1;		elf_auxargs->execfd = -1;
▲ Show 20 Lines • Show All 1,456 Lines • Show Last 20 Lines