Commit a628e7b8 authored Feb 14, 2011 by Chris Wright Committed by James Morris Feb 15, 2011

pci: use security_capable() when checking capablities during config space read



This reintroduces commit 47970b1b which was subsequently reverted
as f00eaeea.  The original change was broken and caused X startup
failures and generally made privileged processes incapable of reading
device dependent config space.  The normal capable() interface returns
true on success, but the LSM interface returns 0 on success.  This thinko
is now fixed in this patch, and has been confirmed to work properly.

So, once again...Eric Paris noted that commit de139a33 ("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.

Reported-by: Eric Paris <eparis@redhat.com>
Tested-by: Dave Young <hidave.darkstar@gmail.com>
Acked-by: James Morris <jmorris@namei.org>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Alex Riesen <raa.lkml@gmail.com>
Cc: Sedat Dilek <sedat.dilek@googlemail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: James Morris <jmorris@namei.org>

parent 795abaf1

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;

Admin message