From owner-svn-src-all@FreeBSD.ORG  Thu Aug  5 20:49:48 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 43DDD1065674;
	Thu,  5 Aug 2010 20:49:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 31C818FC1F;
	Thu,  5 Aug 2010 20:49:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o75KnmFo002262;
	Thu, 5 Aug 2010 20:49:48 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o75KnmgU002260;
	Thu, 5 Aug 2010 20:49:48 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201008052049.o75KnmgU002260@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 5 Aug 2010 20:49:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210897 - stable/6/sys/dev/ipmi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Aug 2010 20:49:48 -0000

Author: jhb
Date: Thu Aug  5 20:49:47 2010
New Revision: 210897
URL: http://svn.freebsd.org/changeset/base/210897

Log:
  MFC 210604:
  Fix test for double-nul characters that terminate the string table at
  the end of each SMBIOS/DMI structure.

Modified:
  stable/6/sys/dev/ipmi/ipmi_smbios.c
Directory Properties:
  stable/6/sys/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/dev/ipmi/ipmi_smbios.c
==============================================================================
--- stable/6/sys/dev/ipmi/ipmi_smbios.c	Thu Aug  5 20:45:46 2010	(r210896)
+++ stable/6/sys/dev/ipmi/ipmi_smbios.c	Thu Aug  5 20:49:47 2010	(r210897)
@@ -189,7 +189,7 @@ smbios_walk_table(uint8_t *p, int entrie
 		 * formatted area of this structure.
 		 */
 		p += s->length;
-		while (p[0] != 0 && p[1] != 0)
+		while (!(p[0] == 0 && p[1] == 0))
 			p++;
 
 		/*