D9321.1784751952.diff
No OneTemporary
Actions

Size

790 B

Referenced Files

None

Subscribers

None

D9321.1784751952.diff
View Options

	Index: head/sys/kern/imgact_elf.c
	===================================================================
	--- head/sys/kern/imgact_elf.c
	+++ head/sys/kern/imgact_elf.c
	@@ -859,6 +859,7 @@
	error = ENOEXEC;
	goto ret;
	}
	+ et_dyn_addr = 0;
	if (hdr->e_type == ET_DYN) {
	if ((brand_info->flags & BI_CAN_EXEC_DYN) == 0) {
	uprintf("Cannot execute shared object\n");
	@@ -871,10 +872,7 @@
	*/
	if (baddr == 0)
	et_dyn_addr = ET_DYN_LOAD_ADDR;
	- else
	- et_dyn_addr = 0;
	- } else
	- et_dyn_addr = 0;
	+ }
	sv = brand_info->sysvec;
	if (interp != NULL && brand_info->interp_newpath != NULL)
	newinterp = brand_info->interp_newpath;
	@@ -1058,7 +1056,7 @@
	imgp->reloc_base = addr;
	imgp->proc->p_osrel = osrel;

	- ret:
	+ret:
	free(interp_buf, M_TEMP);
	return (error);
	}