svn commit: r291597 - head/sys/kern

[Nathan Whitehorn]

Author: nwhitehorn
Date: Tue Dec  1 17:00:31 2015
New Revision: 291597
URL: https://svnweb.freebsd.org/changeset/base/291597

Log:
  Missed header_supported call from r291020: make really, really sure the brand
  likes the executable.

Modified:
  head/sys/kern/imgact_elf.c

Modified: head/sys/kern/imgact_elf.c
==============================================================================
--- head/sys/kern/imgact_elf.c	Tue Dec  1 16:42:39 2015	(r291596)
+++ head/sys/kern/imgact_elf.c	Tue Dec  1 17:00:31 2015	(r291597)
@@ -273,6 +273,9 @@ __elfN(get_brandinfo)(struct image_param
 		if (hdr->e_machine == bi->machine && (bi->flags &
 		    (BI_BRAND_NOTE|BI_BRAND_NOTE_MANDATORY)) != 0) {
 			ret = __elfN(check_note)(imgp, bi->brand_note, osrel);
+			/* Give brand a chance to veto check_note's guess */
+			if (ret && bi->header_supported)
+				ret = bi->header_supported(imgp);
 			if (ret)
 				return (bi);
 		}