svn commit: r315240 - stable/11/sys/kern

Konstantin Belousov kib at FreeBSD.org
Tue Mar 14 10:08:13 UTC 2017


Author: kib
Date: Tue Mar 14 10:08:12 2017
New Revision: 315240
URL: https://svnweb.freebsd.org/changeset/base/315240

Log:
  MFC r314850:
  Require whole brand string matching for old Elf branding.

Modified:
  stable/11/sys/kern/imgact_elf.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/imgact_elf.c
==============================================================================
--- stable/11/sys/kern/imgact_elf.c	Tue Mar 14 10:06:20 2017	(r315239)
+++ stable/11/sys/kern/imgact_elf.c	Tue Mar 14 10:08:12 2017	(r315240)
@@ -309,8 +309,8 @@ __elfN(get_brandinfo)(struct image_param
 			continue;
 		if (hdr->e_machine == bi->machine &&
 		    (hdr->e_ident[EI_OSABI] == bi->brand ||
-		    strncmp((const char *)&hdr->e_ident[OLD_EI_BRAND],
-		    bi->compat_3_brand, strlen(bi->compat_3_brand)) == 0)) {
+		    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 || bi->header_supported(imgp))
 				return (bi);


More information about the svn-src-all mailing list