[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LRH.2.00.1102141203430.12055@tundra.namei.org>
Date: Mon, 14 Feb 2011 12:04:37 +1100 (EST)
From: James Morris <jmorris@...ei.org>
To: Chris Wright <chrisw@...s-sol.org>
cc: Linus Torvalds <torvalds@...ux-foundation.org>,
Dave Airlie <airlied@...il.com>,
Dave Young <hidave.darkstar@...il.com>,
linux-kernel@...r.kernel.org, David Airlie <airlied@...ux.ie>,
dri-devel@...ts.freedesktop.org
Subject: Re: Regression - Xorg start failed
On Sun, 13 Feb 2011, Chris Wright wrote:
> 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 <chrisw@...s-sol.org>
Sorry, I should have caught this.
Acked-by: James Morris <jmorris@...ei.org>
> ---
>
> 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;
>
>
--
James Morris
<jmorris@...ei.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists