From owner-svn-src-stable-7@FreeBSD.ORG Thu Aug 5 19:43:32 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 99F0D106567F; Thu, 5 Aug 2010 19:43:32 +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 87F358FC1E; Thu, 5 Aug 2010 19:43:32 +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 o75JhW7S087054; Thu, 5 Aug 2010 19:43:32 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o75JhWss087052; Thu, 5 Aug 2010 19:43:32 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201008051943.o75JhWss087052@svn.freebsd.org> From: John Baldwin Date: Thu, 5 Aug 2010 19:43:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210891 - stable/7/sys/dev/ipmi X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2010 19:43:32 -0000 Author: jhb Date: Thu Aug 5 19:43:32 2010 New Revision: 210891 URL: http://svn.freebsd.org/changeset/base/210891 Log: MFC 210604: Fix test for double-nul characters that terminate the string table at the end of each SMBIOS/DMI structure. Modified: stable/7/sys/dev/ipmi/ipmi_smbios.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/ipmi/ipmi_smbios.c ============================================================================== --- stable/7/sys/dev/ipmi/ipmi_smbios.c Thu Aug 5 19:43:19 2010 (r210890) +++ stable/7/sys/dev/ipmi/ipmi_smbios.c Thu Aug 5 19:43:32 2010 (r210891) @@ -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++; /*