Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-1
+2
-1
drivers/pci/pci-sysfs.c
+2
-1
drivers/pci/pci-sysfs.c
···
23
23
#include <linux/mm.h>
24
24
#include <linux/fs.h>
25
25
#include <linux/capability.h>
26
+
#include <linux/security.h>
26
27
#include <linux/pci-aspm.h>
27
28
#include <linux/slab.h>
28
29
#include "pci.h"
···
369
368
u8 *data = (u8*) buf;
370
369
371
370
/* Several chips lock up trying to read undefined config space */
372
-
if (cap_raised(filp->f_cred->cap_effective, CAP_SYS_ADMIN)) {
371
+
if (security_capable(filp->f_cred, CAP_SYS_ADMIN) == 0) {
373
372
size = dev->cfg_size;
374
373
} else if (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {
375
374
size = 128;