Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 19 Nov 2016 16:08:40 +0000 (UTC)
From:      Toomas Soome <tsoome@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r308843 - head/sys/boot/i386/libi386
Message-ID:  <201611191608.uAJG8eH6039065@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tsoome
Date: Sat Nov 19 16:08:40 2016
New Revision: 308843
URL: https://svnweb.freebsd.org/changeset/base/308843

Log:
  loader: smbios version check is not correct
  
  The version check for sku and family values is not correct, as this data is
  valid for version 2.4+, that also includes version 3.0 and above.
  
  Reported by:	Dan McDonald
  Reviewed by:	allanjude
  Approved by:	allanjude (mentor)
  Differential Revision:	https://reviews.freebsd.org/D8578

Modified:
  head/sys/boot/i386/libi386/smbios.c

Modified: head/sys/boot/i386/libi386/smbios.c
==============================================================================
--- head/sys/boot/i386/libi386/smbios.c	Sat Nov 19 16:05:55 2016	(r308842)
+++ head/sys/boot/i386/libi386/smbios.c	Sat Nov 19 16:08:40 2016	(r308843)
@@ -238,7 +238,8 @@ smbios_parse_table(const caddr_t addr)
 		smbios_setenv("smbios.system.serial", addr, 0x07);
 		smbios_setuuid("smbios.system.uuid", addr + 0x08, smbios.ver);
 #endif
-		if (smbios.major >= 2 && smbios.minor >= 4) {
+		if (smbios.major > 2 ||
+		    (smbios.major == 2 && smbios.minor >= 4)) {
 			smbios_setenv("smbios.system.sku", addr, 0x19);
 			smbios_setenv("smbios.system.family", addr, 0x1a);
 		}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611191608.uAJG8eH6039065>