D13945.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D13945.diff
View Options

	Index: head/sys/kern/imgact_elf.c
	===================================================================
	--- head/sys/kern/imgact_elf.c
	+++ head/sys/kern/imgact_elf.c
	@@ -321,7 +321,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
	@@ -369,7 +369,8 @@
	/* ELF image p_filesz includes terminating zero */
	strlen(bi->interp_path) + 1 == interp_name_len &&
	strncmp(interp, bi->interp_path, interp_name_len)
	- == 0)
	+ == 0 && (bi->header_supported == NULL \|\|
	+ bi->header_supported(imgp)))
	return (bi);
	}
	}
	@@ -381,7 +382,9 @@
	(interp != NULL && (bi->flags & BI_BRAND_ONLY_STATIC) != 0))
	continue;
	if (hdr->e_machine == bi->machine &&
	- __elfN(fallback_brand) == bi->brand)
	+ __elfN(fallback_brand) == bi->brand &&
	+ (bi->header_supported == NULL \|\|
	+ bi->header_supported(imgp)))
	return (bi);
	}
	return (NULL);