From owner-freebsd-bugs@FreeBSD.ORG Thu Jan 19 18:30:11 2012 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83F3F1065672 for ; Thu, 19 Jan 2012 18:30:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3F1EF8FC18 for ; Thu, 19 Jan 2012 18:30:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q0JIUBBr085324 for ; Thu, 19 Jan 2012 18:30:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q0JIUBAF085321; Thu, 19 Jan 2012 18:30:11 GMT (envelope-from gnats) Resent-Date: Thu, 19 Jan 2012 18:30:11 GMT Resent-Message-Id: <201201191830.q0JIUBAF085321@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Chuck Tuffli Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE217106566C for ; Thu, 19 Jan 2012 18:20:43 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id BD9D68FC15 for ; Thu, 19 Jan 2012 18:20:43 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q0JIKhmo065021 for ; Thu, 19 Jan 2012 18:20:43 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q0JIKh6J065020; Thu, 19 Jan 2012 18:20:43 GMT (envelope-from nobody) Message-Id: <201201191820.q0JIKh6J065020@red.freebsd.org> Date: Thu, 19 Jan 2012 18:20:43 GMT From: Chuck Tuffli To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: kern/164313: Fix pci_get_vpd_readonly_method X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jan 2012 18:30:11 -0000 >Number: 164313 >Category: kern >Synopsis: Fix pci_get_vpd_readonly_method >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Jan 19 18:30:10 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Chuck Tuffli >Release: 8-stable >Organization: >Environment: FreeBSD tm4.lab.rv.emulex.com 8.2-STABLE FreeBSD 8.2-STABLE #32 r229528M: Thu Jan 19 09:42:27 PST 2012 ctuffli@rvctuffli.lab.rv.emulex.com:/usr/home/ctuffli/dev/releng_8/obj/usr/home/ctuffli/dev/releng_8/src/sys/DTRACE amd64 >Description: The pci_get_vpd_readonly_method function always returns ENXIO because it is missing a break statement if the keyword is found in the VPD read-only section. Without the break statement, the for loop continues checking the remaining keywords even if it discovers the desired key, and it exits with i == cfg->vpd.vpd_rocnt. This indistinguishable from not finding the desired key. >How-To-Repeat: Issue pci_get_vpd_readonly(dev, "SN", &str) to any device with a valid VPD >Fix: Add a break to the "if" statement Index: sys/dev/pci/pci.c =================================================================== --- sys/dev/pci/pci.c (revision 229528) +++ sys/dev/pci/pci.c (working copy) @@ -1076,6 +1076,7 @@ if (memcmp(kw, cfg->vpd.vpd_ros[i].keyword, sizeof(cfg->vpd.vpd_ros[i].keyword)) == 0) { *vptr = cfg->vpd.vpd_ros[i].value; + break; } if (i != cfg->vpd.vpd_rocnt) >Release-Note: >Audit-Trail: >Unformatted: