diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-13 08:26:48 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-13 08:26:48 -0400 |
commit | 283bd0665fa547cf17fcf1ba09ec14eae9091749 (patch) | |
tree | b6b3f00a19064dd9b5948318c2c68a5f844cb875 /PCI-Lock-down-BAR-access-when-module-security-is-ena.patch | |
parent | 32dcd3a968405b9678a538d951a0789e8eeb51ea (diff) | |
download | kernel-283bd0665fa547cf17fcf1ba09ec14eae9091749.tar.gz kernel-283bd0665fa547cf17fcf1ba09ec14eae9091749.tar.xz kernel-283bd0665fa547cf17fcf1ba09ec14eae9091749.zip |
Linux v4.0-rc3-148-gc202baf017ae
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.patch | 8 |
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 9a234bcfc..916ba60eb 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 aa012fb3834b..35cb5e9ff9a1 100644 +index 312f23a8429c..93e6ac103dd0 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -30,6 +30,7 @@ @@ -27,7 +27,7 @@ index aa012fb3834b..35cb5e9ff9a1 100644 #include "pci.h" static int sysfs_initialized; /* = 0 */ -@@ -709,6 +710,9 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj, +@@ -710,6 +711,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 aa012fb3834b..35cb5e9ff9a1 100644 if (off > dev->cfg_size) return 0; if (off + count > dev->cfg_size) { -@@ -1003,6 +1007,9 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr, +@@ -1004,6 +1008,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 aa012fb3834b..35cb5e9ff9a1 100644 for (i = 0; i < PCI_ROM_RESOURCE; i++) if (res == &pdev->resource[i]) break; -@@ -1104,6 +1111,9 @@ static ssize_t pci_write_resource_io(struct file *filp, struct kobject *kobj, +@@ -1105,6 +1112,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) { |