[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1297318312-14309-3-git-send-email-chrisw@sous-sol.org>
Date: Wed, 9 Feb 2011 22:11:52 -0800
From: Chris Wright <chrisw@...s-sol.org>
To: linux-kernel@...r.kernel.org,
Jesse Barnes <jbarnes@...tuousgeek.org>
Cc: Eric Paris <eparis@...hat.com>, Don Dutile <ddutile@...hat.com>,
chrisw@...s-sol.org, Greg Kroah-Hartman <gregkh@...e.de>,
Alan Cox <alan@...rguk.ukuu.org.uk>, linux-pci@...r.kernel.org
Subject: [PATCH 2/2] pci: use security_capable() when checking capablities during config space read
Eric Paris noted that commit de139a3 ("pci: check caps from sysfs file
open to read device dependent config space") caused the capability check
to bypass security modules and potentially auditing. Rectify this by
calling security_capable() when checking the open file's capabilities
for config space reads.
Cc: Eric Paris <eparis@...hat.com>
Cc: Greg Kroah-Hartman <gregkh@...e.de>
Cc: Jesse Barnes <jbarnes@...tuousgeek.org>
Cc: Alan Cox <alan@...rguk.ukuu.org.uk>
Cc: linux-pci@...r.kernel.org
Signed-off-by: Chris Wright <chrisw@...s-sol.org>
---
drivers/pci/pci-sysfs.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 8ecaac9..f7771f3 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -23,6 +23,7 @@
#include <linux/mm.h>
#include <linux/fs.h>
#include <linux/capability.h>
+#include <linux/security.h>
#include <linux/pci-aspm.h>
#include <linux/slab.h>
#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)) {
size = dev->cfg_size;
} else if (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {
size = 128;
--
1.7.3.4
--
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