diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 23:25:11 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 23:25:11 (GMT) |
| commit | c612cc211d7f3ba4c4626d55166b3103d15efd76 (patch) | |
| tree | dce92aca3a8ec99c3e774c09080bdbd704aaef3f /drivers | |
| parent | a7d6e4ecdb7648478ddec76d30d87d03d6e22b31 (diff) | |
| parent | a628e7b87e100befac9702aa0c3b9848a7685e49 (diff) | |
| download | linux-c612cc211d7f3ba4c4626d55166b3103d15efd76.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
pci: use security_capable() when checking capablities during config space read
Diffstat (limited to 'drivers')
| -rw-r--r-- | 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..ea25e5b 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) == 0) { size = dev->cfg_size; } else if (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) { size = 128; |