]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Jan 2014 13:11:47 +0000 (05:11 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Jan 2014 13:11:47 +0000 (05:11 -0800)
added patches:
e752x_edac-fix-pci_dev-usage-count.patch

queue-3.4/e752x_edac-fix-pci_dev-usage-count.patch [new file with mode: 0644]
queue-3.4/series

diff --git a/queue-3.4/e752x_edac-fix-pci_dev-usage-count.patch b/queue-3.4/e752x_edac-fix-pci_dev-usage-count.patch
new file mode 100644 (file)
index 0000000..7274bb5
--- /dev/null
@@ -0,0 +1,41 @@
+From 90ed4988b8c030d65b41b7d13140e9376dc6ec5a Mon Sep 17 00:00:00 2001
+From: Aristeu Rozanski <aris@redhat.com>
+Date: Thu, 5 Dec 2013 10:37:56 -0500
+Subject: e752x_edac: Fix pci_dev usage count
+
+From: Aristeu Rozanski <aris@redhat.com>
+
+commit 90ed4988b8c030d65b41b7d13140e9376dc6ec5a upstream.
+
+In case the device 0, function 1 is not found using pci_get_device(),
+pci_scan_single_device() will be used but, differently than
+pci_get_device(), it allocates a pci_dev but doesn't does bump the usage
+count on the pci_dev and after few module removals and loads the pci_dev
+will be freed.
+
+Signed-off-by: Aristeu Rozanski <aris@redhat.com>
+Reviewed-by: mark gross <mark.gross@intel.com>
+Link: http://lkml.kernel.org/r/20131205153755.GL4545@redhat.com
+Signed-off-by: Borislav Petkov <bp@suse.de>
+Cc: Jean Delvare <jdelvare@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/edac/e752x_edac.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/edac/e752x_edac.c
++++ b/drivers/edac/e752x_edac.c
+@@ -1145,9 +1145,11 @@ static int e752x_get_devs(struct pci_dev
+       pvt->bridge_ck = pci_get_device(PCI_VENDOR_ID_INTEL,
+                               pvt->dev_info->err_dev, pvt->bridge_ck);
+-      if (pvt->bridge_ck == NULL)
++      if (pvt->bridge_ck == NULL) {
+               pvt->bridge_ck = pci_scan_single_device(pdev->bus,
+                                                       PCI_DEVFN(0, 1));
++              pci_dev_get(pvt->bridge_ck);
++      }
+       if (pvt->bridge_ck == NULL) {
+               e752x_printk(KERN_ERR, "error reporting device not found:"
index bf6ff413e1e03a2d00153246bf56c276ac3c4d80..e4aece9508ad76188fe01e28df36f3a6eeb967ab 100644 (file)
@@ -1,2 +1,3 @@
 md-raid5-fix-long-standing-problem-with-bitmap-handling-on-write-failure.patch
 mm-hugetlbfs-fix-hugetlbfs-optimization.patch
+e752x_edac-fix-pci_dev-usage-count.patch