Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c612cc21 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

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
parents a7d6e4ec a628e7b8

drivers/pci/pci-sysfs.c

+2 −1
Original line number Diff line number Diff line
@@ -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;