D13945.id38072.diff
No OneTemporary
Actions

Size

874 B

Referenced Files

None

Subscribers

None

D13945.id38072.diff
View Options

	Index: sys/kern/imgact_elf.c
	===================================================================
	--- sys/kern/imgact_elf.c
	+++ sys/kern/imgact_elf.c
	@@ -322,7 +322,7 @@
	strcmp((const char *)&hdr->e_ident[OLD_EI_BRAND],
	bi->compat_3_brand) == 0))) {
	/* Looks good, but give brand a chance to veto */
	- if (!bi->header_supported \|\|
	+ if (bi->header_supported == NULL \|\|
	bi->header_supported(imgp)) {
	/*
	* Again, prefer strictly matching
	@@ -370,8 +370,12 @@
	/* ELF image p_filesz includes terminating zero */
	strlen(bi->interp_path) + 1 == interp_name_len &&
	strncmp(interp, bi->interp_path, interp_name_len)
	- == 0)
	- return (bi);
	+ == 0) {
	+ /* Give brand a chance to veto. */
	+ if (bi->header_supported == NULL \|\|
	+ bi->header_supported(imgp))
	+ return (bi);
	+ }
	}
	}