Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2018-11-01 16:18:27 +0100
committerBorislav Petkov <bp@suse.de>2018-11-01 16:18:50 +0100
commit9ab91ee2d430cb540321bdc6c2f090639584fddc (patch)
treeb60df2c9049a13f693deecac8e92b60f7965061d
parent7705c3b800985221802f6815cf7da32b8603c7f9 (diff)
- EDAC, thunderx: Fix memory leak in thunderx_l2c_threaded_isr()
(bsc#1114279). - blacklist.conf:
-rw-r--r--blacklist.conf1
-rw-r--r--patches.drivers/edac-thunderx-fix-memory-leak-in-thunderx_l2c_threaded_isr.patch47
-rw-r--r--series.conf1
3 files changed, 49 insertions, 0 deletions
diff --git a/blacklist.conf b/blacklist.conf
index 30bec138ed..b8c4ff0db7 100644
--- a/blacklist.conf
+++ b/blacklist.conf
@@ -883,3 +883,4 @@ d60996ab430c8a6033a0944c068edc5ec5becb9b # Duplicate of 3af71f649d22f359790b4032
c894696188d5c2af1e636e458190e80c53fb893d # rtlwifi: the target function doesn't exist yet
16d571bb0fe6aa7fed82e19166ca1542026c9c06 # rt2x00: not cleanly applicable, merely optimization
d59d2f9995d28974877750f429e821324bd603c7 # r8822be: not present in SLE15
+711f76a328cbe5b49164bb14bcb593fa52102051 # trivial, no need
diff --git a/patches.drivers/edac-thunderx-fix-memory-leak-in-thunderx_l2c_threaded_isr.patch b/patches.drivers/edac-thunderx-fix-memory-leak-in-thunderx_l2c_threaded_isr.patch
new file mode 100644
index 0000000000..8d07e3208f
--- /dev/null
+++ b/patches.drivers/edac-thunderx-fix-memory-leak-in-thunderx_l2c_threaded_isr.patch
@@ -0,0 +1,47 @@
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Sat, 13 Oct 2018 13:28:43 +0300
+Subject: EDAC, thunderx: Fix memory leak in thunderx_l2c_threaded_isr()
+Git-commit: d8c27ba86a2fd806d3957e5a9b30e66dfca2a61d
+Patch-mainline: v4.20-rc1
+References: bsc#1114279
+
+Fix memory leak in L2c threaded interrupt handler.
+
+ [ bp: Rewrite commit message. ]
+
+Fixes: 41003396f932 ("EDAC, thunderx: Add Cavium ThunderX EDAC driver")
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+CC: David Daney <david.daney@cavium.com>
+CC: Jan Glauber <jglauber@cavium.com>
+CC: Mauro Carvalho Chehab <mchehab@kernel.org>
+CC: Sergey Temerkhanov <s.temerkhanov@gmail.com>
+CC: linux-edac <linux-edac@vger.kernel.org>
+Link: http://lkml.kernel.org/r/20181013102843.GG16086@mwanda
+---
+ drivers/edac/thunderx_edac.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/edac/thunderx_edac.c b/drivers/edac/thunderx_edac.c
+index c009d94f40c5..34be60fe6892 100644
+--- a/drivers/edac/thunderx_edac.c
++++ b/drivers/edac/thunderx_edac.c
+@@ -1884,7 +1884,7 @@ static irqreturn_t thunderx_l2c_threaded_isr(int irq, void *irq_id)
+ default:
+ dev_err(&l2c->pdev->dev, "Unsupported device: %04x\n",
+ l2c->pdev->device);
+- return IRQ_NONE;
++ goto err_free;
+ }
+
+ while (CIRC_CNT(l2c->ring_head, l2c->ring_tail,
+@@ -1906,7 +1906,7 @@ static irqreturn_t thunderx_l2c_threaded_isr(int irq, void *irq_id)
+ l2c->ring_tail++;
+ }
+
+- return IRQ_HANDLED;
++ ret = IRQ_HANDLED;
+
+ err_free:
+ kfree(other);
+
diff --git a/series.conf b/series.conf
index feb64ef53d..ccba057071 100644
--- a/series.conf
+++ b/series.conf
@@ -18234,6 +18234,7 @@
patches.fixes/nvdimm-use-namespace-index-data-to-reduce-number-of-label-reads-needed.patch
patches.fixes/libnvdimm-label-fix-sparse-warning.patch
patches.drivers/edac-raise-the-maximum-number-of-memory-controllers.patch
+ patches.drivers/edac-thunderx-fix-memory-leak-in-thunderx_l2c_threaded_isr.patch
patches.drivers/PCI-ASPM-Fix-link_state-teardown-on-device-removal.patch
patches.drivers/scsi-qla2xxx-Fix-process-response-queue-for-ISP26XX-.patch
patches.drivers/scsi-qla2xxx-Fix-incorrect-port-speed-being-set-for-.patch