summaryrefslogtreecommitdiffstats
path: root/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-10 09:14:00 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-10 09:14:00 -0400
commit35ac9a875942baf213b210ef2954da4fa0f3b463 (patch)
treee2ed984e81584a9a89cac4ba17a8e7ee65f690aa /PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
parentc01ddf0dcd7e42362ea1be6489b7da7500032c24 (diff)
downloadkernel-35ac9a875942baf213b210ef2954da4fa0f3b463.tar.gz
kernel-35ac9a875942baf213b210ef2954da4fa0f3b463.tar.xz
kernel-35ac9a875942baf213b210ef2954da4fa0f3b463.zip
Linux v3.17-6136-gc798360cd143
Diffstat (limited to 'PCI-Lock-down-BAR-access-when-module-security-is-ena.patch')
-rw-r--r--PCI-Lock-down-BAR-access-when-module-security-is-ena.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch b/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
index 2fc17c0b4..01af607ea 100644
--- a/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
+++ b/PCI-Lock-down-BAR-access-when-module-security-is-ena.patch
@@ -16,7 +16,7 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
-index 9ff0a901ecf7..8d0d5d92b8d9 100644
+index 92b6d9ab00e4..f77f893114a4 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -30,6 +30,7 @@
@@ -27,7 +27,7 @@ index 9ff0a901ecf7..8d0d5d92b8d9 100644
#include "pci.h"
static int sysfs_initialized; /* = 0 */
-@@ -704,6 +705,9 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj,
+@@ -703,6 +704,9 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj,
loff_t init_off = off;
u8 *data = (u8 *) buf;
@@ -37,7 +37,7 @@ index 9ff0a901ecf7..8d0d5d92b8d9 100644
if (off > dev->cfg_size)
return 0;
if (off + count > dev->cfg_size) {
-@@ -998,6 +1002,9 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
+@@ -997,6 +1001,9 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
resource_size_t start, end;
int i;
@@ -47,7 +47,7 @@ index 9ff0a901ecf7..8d0d5d92b8d9 100644
for (i = 0; i < PCI_ROM_RESOURCE; i++)
if (res == &pdev->resource[i])
break;
-@@ -1099,6 +1106,9 @@ static ssize_t pci_write_resource_io(struct file *filp, struct kobject *kobj,
+@@ -1098,6 +1105,9 @@ static ssize_t pci_write_resource_io(struct file *filp, struct kobject *kobj,
struct bin_attribute *attr, char *buf,
loff_t off, size_t count)
{