Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755319Ab1BNAft (ORCPT ); Sun, 13 Feb 2011 19:35:49 -0500 Received: from sous-sol.org ([216.99.217.87]:44408 "EHLO sequoia.sous-sol.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755225Ab1BNAfp (ORCPT ); Sun, 13 Feb 2011 19:35:45 -0500 Date: Sun, 13 Feb 2011 16:35:31 -0800 From: Chris Wright To: Linus Torvalds Cc: Dave Airlie , Dave Young , linux-kernel@vger.kernel.org, David Airlie , dri-devel@lists.freedesktop.org, Chris Wright , James Morris Subject: Re: Regression - Xorg start failed Message-ID: <20110214003531.GH9869@sequoia.sous-sol.org> References: <20110213062213.GA2525@darkstar.dhcp.inet.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-08-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1690 Lines: 47 * Linus Torvalds (torvalds@linux-foundation.org) wrote: > On Sat, Feb 12, 2011 at 11:53 PM, Dave Airlie wrote: > > Probably should revert first, then work out what is crapping out libpciaccess. > > Yeah, I'll revert. The patch is one of those "obviously a good idea, > but in practice it's not something we can change now". Turns out I'm just a bona fide idiot. I was not testing the right kernel _and_ didn't get the logic right. sorry for the screw up, -chris --- Subject: [PATCH] pci: use security_capable correctly during config space read Commit 47970b1 ("pci: use security_capable() when checking capablities during config space read") is just plain broken. The normal capable() interface returns true on success, but the LSM interface returns 0 on success. Signed-off-by: Chris Wright --- I've tested this quickly (lspci behaviour is as expected). diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index f7771f3..ea25e5b 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -369,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 (security_capable(filp->f_cred, 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/