From: Greg Kroah-Hartman Date: Fri, 24 Oct 2014 22:52:39 +0000 (+0800) Subject: remove some more patches that broke things or were not needed: X-Git-Tag: v3.10.59~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64d354077b5a17cfcf92397567cdaca46ec2d0e6;p=thirdparty%2Fkernel%2Fstable-queue.git remove some more patches that broke things or were not needed: pci-pciehp-prevent-null-dereference-during-probe.patch queue-3.14/ima-fix-fallback-to-use-new_sync_read.patch --- diff --git a/queue-3.10/pci-pciehp-prevent-null-dereference-during-probe.patch b/queue-3.10/pci-pciehp-prevent-null-dereference-during-probe.patch deleted file mode 100644 index 59ecd4323ce..00000000000 --- a/queue-3.10/pci-pciehp-prevent-null-dereference-during-probe.patch +++ /dev/null @@ -1,40 +0,0 @@ -From bceee4a97eb58bd0e80e39eff11b506ddd9e7ad3 Mon Sep 17 00:00:00 2001 -From: Andreas Noever -Date: Tue, 16 Sep 2014 15:16:02 -0600 -Subject: PCI: pciehp: Prevent NULL dereference during probe - -From: Andreas Noever - -commit bceee4a97eb58bd0e80e39eff11b506ddd9e7ad3 upstream. - -pciehp assumes that dev->subordinate, the struct pci_bus for a bridge's -secondary bus, exists. But we do not create that bus if we run out of bus -numbers during enumeration. This leads to a NULL dereference in -init_slot() (and other places). - -Change pciehp_probe() to return -ENODEV when no secondary bus is present. - -Signed-off-by: Andreas Noever -Signed-off-by: Bjorn Helgaas -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/pci/hotplug/pciehp_core.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/pci/hotplug/pciehp_core.c -+++ b/drivers/pci/hotplug/pciehp_core.c -@@ -237,6 +237,13 @@ static int pciehp_probe(struct pcie_devi - else if (pciehp_acpi_slot_detection_check(dev->port)) - goto err_out_none; - -+ if (!dev->port->subordinate) { -+ /* Can happen if we run out of bus numbers during probe */ -+ dev_err(&dev->device, -+ "Hotplug bridge without secondary bus, ignoring\n"); -+ goto err_out_none; -+ } -+ - ctrl = pcie_init(dev); - if (!ctrl) { - dev_err(&dev->device, "Controller initialization failed\n"); diff --git a/queue-3.10/series b/queue-3.10/series index 4a716ee03da..3161d236436 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -26,7 +26,6 @@ nfsv4-fix-lock-recovery-when-create_session-setclientid_confirm-fails.patch nfsv4-fix-open-lock-state-recovery-error-handling.patch nfsv4.1-fix-an-nfsv4.1-state-renewal-regression.patch iwlwifi-add-missing-pci-ids-for-the-7260-series.patch -pci-pciehp-prevent-null-dereference-during-probe.patch pci-increase-ibm-ipr-sas-crocodile-bars-to-at-least-system-page-size.patch pci-generate-uppercase-hex-for-modalias-interface-class.patch rt2800-correct-bbp1_tx_power_ctrl-mask.patch diff --git a/queue-3.14/ima-fix-fallback-to-use-new_sync_read.patch b/queue-3.14/ima-fix-fallback-to-use-new_sync_read.patch deleted file mode 100644 index f1a95b6815d..00000000000 --- a/queue-3.14/ima-fix-fallback-to-use-new_sync_read.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 27cd1fc3ae5374a4a86662c67033f15ef27b2461 Mon Sep 17 00:00:00 2001 -From: Dmitry Kasatkin -Date: Mon, 23 Jun 2014 20:32:56 +0300 -Subject: ima: fix fallback to use new_sync_read() - -From: Dmitry Kasatkin - -commit 27cd1fc3ae5374a4a86662c67033f15ef27b2461 upstream. - -3.16 commit aad4f8bb42af06371aa0e85bf0cd9d52c0494985 -'switch simple generic_file_aio_read() users to ->read_iter()' -replaced ->aio_read with ->read_iter in most of the file systems -and introduced new_sync_read() as a replacement for do_sync_read(). - -Most of file systems set '->read' and ima_kernel_read is not affected. -When ->read is not set, this patch adopts fallback call changes from the -vfs_read. - -Signed-off-by: Dmitry Kasatkin -Signed-off-by: Mimi Zohar -Signed-off-by: Greg Kroah-Hartman - ---- - security/integrity/ima/ima_crypto.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/security/integrity/ima/ima_crypto.c -+++ b/security/integrity/ima/ima_crypto.c -@@ -38,19 +38,19 @@ static int ima_kernel_read(struct file * - { - mm_segment_t old_fs; - char __user *buf = addr; -- ssize_t ret; -+ ssize_t ret = -EINVAL; - - if (!(file->f_mode & FMODE_READ)) - return -EBADF; -- if (!file->f_op->read && !file->f_op->aio_read) -- return -EINVAL; - - old_fs = get_fs(); - set_fs(get_ds()); - if (file->f_op->read) - ret = file->f_op->read(file, buf, count, &offset); -- else -+ else if (file->f_op->aio_read) - ret = do_sync_read(file, buf, count, &offset); -+ else if (file->f_op->read_iter) -+ ret = new_sync_read(file, buf, count, &offset); - set_fs(old_fs); - return ret; - } diff --git a/queue-3.14/pci-pciehp-prevent-null-dereference-during-probe.patch b/queue-3.14/pci-pciehp-prevent-null-dereference-during-probe.patch deleted file mode 100644 index d50cbdef8d3..00000000000 --- a/queue-3.14/pci-pciehp-prevent-null-dereference-during-probe.patch +++ /dev/null @@ -1,40 +0,0 @@ -From bceee4a97eb58bd0e80e39eff11b506ddd9e7ad3 Mon Sep 17 00:00:00 2001 -From: Andreas Noever -Date: Tue, 16 Sep 2014 15:16:02 -0600 -Subject: PCI: pciehp: Prevent NULL dereference during probe - -From: Andreas Noever - -commit bceee4a97eb58bd0e80e39eff11b506ddd9e7ad3 upstream. - -pciehp assumes that dev->subordinate, the struct pci_bus for a bridge's -secondary bus, exists. But we do not create that bus if we run out of bus -numbers during enumeration. This leads to a NULL dereference in -init_slot() (and other places). - -Change pciehp_probe() to return -ENODEV when no secondary bus is present. - -Signed-off-by: Andreas Noever -Signed-off-by: Bjorn Helgaas -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/pci/hotplug/pciehp_core.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/pci/hotplug/pciehp_core.c -+++ b/drivers/pci/hotplug/pciehp_core.c -@@ -254,6 +254,13 @@ static int pciehp_probe(struct pcie_devi - else if (pciehp_acpi_slot_detection_check(dev->port)) - goto err_out_none; - -+ if (!dev->port->subordinate) { -+ /* Can happen if we run out of bus numbers during probe */ -+ dev_err(&dev->device, -+ "Hotplug bridge without secondary bus, ignoring\n"); -+ goto err_out_none; -+ } -+ - ctrl = pcie_init(dev); - if (!ctrl) { - dev_err(&dev->device, "Controller initialization failed\n"); diff --git a/queue-3.14/series b/queue-3.14/series index 9f905720027..da7113329d1 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -41,7 +41,6 @@ nfsv4-fix-lock-recovery-when-create_session-setclientid_confirm-fails.patch nfsv4-fix-open-lock-state-recovery-error-handling.patch nfsv4.1-fix-an-nfsv4.1-state-renewal-regression.patch iwlwifi-add-missing-pci-ids-for-the-7260-series.patch -pci-pciehp-prevent-null-dereference-during-probe.patch pci-mvebu-fix-uninitialized-variable-in-mvebu_get_tgt_attr.patch pci-increase-ibm-ipr-sas-crocodile-bars-to-at-least-system-page-size.patch pci-generate-uppercase-hex-for-modalias-interface-class.patch @@ -54,5 +53,4 @@ fanotify-enable-close-on-exec-on-events-fd-when-requested-in-fanotify_init.patch kernel-add-support-for-gcc-5.patch futex-ensure-get_futex_key_refs-always-implies-a-barrier.patch powerpc-iommu-ddw-fix-endianness.patch -ima-fix-fallback-to-use-new_sync_read.patch ima-provide-flag-to-identify-new-empty-files.patch diff --git a/queue-3.16/pci-pciehp-prevent-null-dereference-during-probe.patch b/queue-3.16/pci-pciehp-prevent-null-dereference-during-probe.patch deleted file mode 100644 index 25dde3ecb93..00000000000 --- a/queue-3.16/pci-pciehp-prevent-null-dereference-during-probe.patch +++ /dev/null @@ -1,40 +0,0 @@ -From bceee4a97eb58bd0e80e39eff11b506ddd9e7ad3 Mon Sep 17 00:00:00 2001 -From: Andreas Noever -Date: Tue, 16 Sep 2014 15:16:02 -0600 -Subject: PCI: pciehp: Prevent NULL dereference during probe - -From: Andreas Noever - -commit bceee4a97eb58bd0e80e39eff11b506ddd9e7ad3 upstream. - -pciehp assumes that dev->subordinate, the struct pci_bus for a bridge's -secondary bus, exists. But we do not create that bus if we run out of bus -numbers during enumeration. This leads to a NULL dereference in -init_slot() (and other places). - -Change pciehp_probe() to return -ENODEV when no secondary bus is present. - -Signed-off-by: Andreas Noever -Signed-off-by: Bjorn Helgaas -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/pci/hotplug/pciehp_core.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/pci/hotplug/pciehp_core.c -+++ b/drivers/pci/hotplug/pciehp_core.c -@@ -255,6 +255,13 @@ static int pciehp_probe(struct pcie_devi - else if (pciehp_acpi_slot_detection_check(dev->port)) - goto err_out_none; - -+ if (!dev->port->subordinate) { -+ /* Can happen if we run out of bus numbers during probe */ -+ dev_err(&dev->device, -+ "Hotplug bridge without secondary bus, ignoring\n"); -+ goto err_out_none; -+ } -+ - ctrl = pcie_init(dev); - if (!ctrl) { - dev_err(&dev->device, "Controller initialization failed\n"); diff --git a/queue-3.16/series b/queue-3.16/series index ca9baea9597..813bdb3b9c0 100644 --- a/queue-3.16/series +++ b/queue-3.16/series @@ -55,7 +55,6 @@ nfs-fix-an-uninitialised-pointer-oops-in-the-writeback-error-path.patch nfs-fix-a-bogus-warning-in-nfs_generic_pgio.patch iwlwifi-mvm-disable-bt-co-running-by-default.patch iwlwifi-add-missing-pci-ids-for-the-7260-series.patch -pci-pciehp-prevent-null-dereference-during-probe.patch pci-mvebu-fix-uninitialized-variable-in-mvebu_get_tgt_attr.patch pci-add-missing-mem_64-mask-in-pci_assign_unassigned_bridge_resources.patch pci-increase-ibm-ipr-sas-crocodile-bars-to-at-least-system-page-size.patch diff --git a/queue-3.17/pci-pciehp-prevent-null-dereference-during-probe.patch b/queue-3.17/pci-pciehp-prevent-null-dereference-during-probe.patch deleted file mode 100644 index 10c15db8fe5..00000000000 --- a/queue-3.17/pci-pciehp-prevent-null-dereference-during-probe.patch +++ /dev/null @@ -1,40 +0,0 @@ -From bceee4a97eb58bd0e80e39eff11b506ddd9e7ad3 Mon Sep 17 00:00:00 2001 -From: Andreas Noever -Date: Tue, 16 Sep 2014 15:16:02 -0600 -Subject: PCI: pciehp: Prevent NULL dereference during probe - -From: Andreas Noever - -commit bceee4a97eb58bd0e80e39eff11b506ddd9e7ad3 upstream. - -pciehp assumes that dev->subordinate, the struct pci_bus for a bridge's -secondary bus, exists. But we do not create that bus if we run out of bus -numbers during enumeration. This leads to a NULL dereference in -init_slot() (and other places). - -Change pciehp_probe() to return -ENODEV when no secondary bus is present. - -Signed-off-by: Andreas Noever -Signed-off-by: Bjorn Helgaas -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/pci/hotplug/pciehp_core.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/pci/hotplug/pciehp_core.c -+++ b/drivers/pci/hotplug/pciehp_core.c -@@ -262,6 +262,13 @@ static int pciehp_probe(struct pcie_devi - goto err_out_none; - } - -+ if (!dev->port->subordinate) { -+ /* Can happen if we run out of bus numbers during probe */ -+ dev_err(&dev->device, -+ "Hotplug bridge without secondary bus, ignoring\n"); -+ goto err_out_none; -+ } -+ - ctrl = pcie_init(dev); - if (!ctrl) { - dev_err(&dev->device, "Controller initialization failed\n"); diff --git a/queue-3.17/series b/queue-3.17/series index f23d05ec2a1..2836b1d65a7 100644 --- a/queue-3.17/series +++ b/queue-3.17/series @@ -65,7 +65,6 @@ nfs-fix-a-bogus-warning-in-nfs_generic_pgio.patch nfsv4.1-pnfs-replace-broken-pnfs_put_lseg_async.patch iwlwifi-mvm-disable-bt-co-running-by-default.patch iwlwifi-add-missing-pci-ids-for-the-7260-series.patch -pci-pciehp-prevent-null-dereference-during-probe.patch pci-mvebu-fix-uninitialized-variable-in-mvebu_get_tgt_attr.patch pci-add-missing-mem_64-mask-in-pci_assign_unassigned_bridge_resources.patch pci-increase-ibm-ipr-sas-crocodile-bars-to-at-least-system-page-size.patch