diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2017-07-11 13:27:04 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2017-07-11 13:27:04 -0500 |
commit | 272a38dcb88cb85ea5d34fdd5134f38da10cc7ad (patch) | |
tree | 3bebc2031ecea52f37209e3b44d0139ac20ac33c /efi-lockdown.patch | |
parent | b0f3de0ab81f4a9d4fe1c0c0ac776d1c747a96f2 (diff) | |
download | kernel-272a38dcb88cb85ea5d34fdd5134f38da10cc7ad.tar.gz kernel-272a38dcb88cb85ea5d34fdd5134f38da10cc7ad.tar.xz kernel-272a38dcb88cb85ea5d34fdd5134f38da10cc7ad.zip |
Revert debuginfo changes for stable rebases
Diffstat (limited to 'efi-lockdown.patch')
-rw-r--r-- | efi-lockdown.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/efi-lockdown.patch b/efi-lockdown.patch index 54a7caa24..e04878458 100644 --- a/efi-lockdown.patch +++ b/efi-lockdown.patch @@ -243,8 +243,8 @@ index 447905e..d44e60e 100644 #include <linux/jiffies.h> +#include <linux/security.h> + #include <linux/usb/xhci-dbgp.h> #include <video/edid.h> - @@ -1183,7 +1184,12 @@ void __init setup_arch(char **cmdline_p) break; case efi_secureboot_mode_enabled: @@ -387,9 +387,9 @@ index d44e60e..f7635d0 100644 +#include <linux/sysrq.h> +#include <linux/init_task.h> + + #include <linux/usb/xhci-dbgp.h> #include <video/edid.h> - #include <asm/mtrr.h> @@ -1328,6 +1333,32 @@ void __init i386_reserve_resources(void) #endif /* CONFIG_X86_32 */ @@ -800,15 +800,15 @@ index 0666287..b10992c 100644 return 0; if (off + count > dev->cfg_size) { @@ -1009,6 +1012,9 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr, - resource_size_t start, end; - int i; + enum pci_mmap_state mmap_type; + struct resource *res = &pdev->resource[bar]; + if (kernel_is_locked_down()) + return -EPERM; + - for (i = 0; i < PCI_ROM_RESOURCE; i++) - if (res == &pdev->resource[i]) - break; + if (res->flags & IORESOURCE_MEM && iomem_is_exclusive(res->start)) + return -EINVAL; + @@ -1108,6 +1114,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) @@ -845,13 +845,13 @@ index f82710a..139d6f0 100644 ret = pci_domain_nr(dev->bus); @@ -233,7 +239,7 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma) struct pci_filp_private *fpriv = file->private_data; - int i, ret, write_combine; + int i, ret, write_combine = 0, res_bit = IORESOURCE_MEM; - if (!capable(CAP_SYS_RAWIO)) + if (!capable(CAP_SYS_RAWIO) || kernel_is_locked_down()) return -EPERM; - /* Make sure the caller is mapping a real resource for this device */ + if (fpriv->mmap_state == pci_mmap_io) { diff --git a/drivers/pci/syscall.c b/drivers/pci/syscall.c index 9bf993e..c095247 100644 --- a/drivers/pci/syscall.c |