From patchwork Wed Feb 16 15:16:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wright X-Patchwork-Id: 567641 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1GFX0ou018865 for ; Wed, 16 Feb 2011 15:33:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752304Ab1BPPci (ORCPT ); Wed, 16 Feb 2011 10:32:38 -0500 Received: from sous-sol.org ([216.99.217.87]:51435 "EHLO sequoia.sous-sol.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752254Ab1BPPce (ORCPT ); Wed, 16 Feb 2011 10:32:34 -0500 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 16 Feb 2011 15:33:01 +0000 (UTC) X-Greylist: delayed 909 seconds by postgrey-1.27 at vger.kernel.org; Wed, 16 Feb 2011 10:32:33 EST Received: from sequoia.sous-sol.org (sequoia.sous-sol.org [127.0.0.1]) by sequoia.sous-sol.org (8.14.3/8.14.3) with ESMTP id p1GFGNKw022339; Wed, 16 Feb 2011 07:16:23 -0800 Received: (from chrisw@localhost) by sequoia.sous-sol.org (8.14.3/8.14.3/Submit) id p1GFGNgW022338; Wed, 16 Feb 2011 07:16:23 -0800 Date: Wed, 16 Feb 2011 07:16:23 -0800 From: Chris Wright To: Alex Williamson Cc: Avi Kivity , chrisw , "Hao, Xudong" , "kvm@vger.kernel.org" Subject: Re: KVM Test report, kernel a685b38... qemu 671d89d... Message-ID: <20110216151623.GR9869@sequoia.sous-sol.org> References: <4D5B9487.2030309@redhat.com> <1297868471.14733.186.camel@x201> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1297868471.14733.186.camel@x201> User-Agent: Mutt/1.5.20 (2009-08-17) X-Virus-Scanned: clamav-milter 0.95.3 at sequoia.sous-sol.org X-Virus-Status: Clean X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, T_RP_MATCHES_RCVD autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on sequoia.sous-sol.org Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 8ecaac9..ea25e5b 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include "pci.h" @@ -368,7 +369,7 @@ pci_read_config(struct file *filp, struct kobject *kobj, u8 *data = (u8*) buf; /* Several chips lock up trying to read undefined config space */ - if (cap_raised(filp->f_cred->cap_effective, CAP_SYS_ADMIN)) { + if (security_capable(filp->f_cred, CAP_SYS_ADMIN) == 0) { size = dev->cfg_size; } else if (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) { size = 128;