diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2019-12-17 00:43:43 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-12-17 00:43:43 +0000 |
| commit | 17056628132c9d9a641ebe2062ac26fdd0687157 (patch) | |
| tree | bc080419dba83ace16bdc5044f58fb4a200e05d5 | |
| parent | e9ce6f0901755807a74ca07095e7b815b926f2ae (diff) | |
| download | linux-stable-queue-17056628132c9d9a641ebe2062ac26fdd0687157.tar.gz | |
Drop bogus fix for qla3xxx
| -rw-r--r-- | queue-3.16/net-qlogic-fix-memory-leak-in-ql_alloc_large_buffers.patch | 27 | ||||
| -rw-r--r-- | queue-3.16/series | 1 |
2 files changed, 0 insertions, 28 deletions
diff --git a/queue-3.16/net-qlogic-fix-memory-leak-in-ql_alloc_large_buffers.patch b/queue-3.16/net-qlogic-fix-memory-leak-in-ql_alloc_large_buffers.patch deleted file mode 100644 index 3b2ef186..00000000 --- a/queue-3.16/net-qlogic-fix-memory-leak-in-ql_alloc_large_buffers.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Navid Emamdoost <navid.emamdoost@gmail.com> -Date: Fri, 4 Oct 2019 15:24:39 -0500 -Subject: net: qlogic: Fix memory leak in ql_alloc_large_buffers - -commit 1acb8f2a7a9f10543868ddd737e37424d5c36cf4 upstream. - -In ql_alloc_large_buffers, a new skb is allocated via netdev_alloc_skb. -This skb should be released if pci_dma_mapping_error fails. - -Fixes: 0f8ab89e825f ("qla3xxx: Check return code from pci_map_single() in ql_release_to_lrg_buf_free_list(), ql_populate_free_queue(), ql_alloc_large_buffers(), and ql3xxx_send()") -Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> -Signed-off-by: David S. Miller <davem@davemloft.net> -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> ---- - drivers/net/ethernet/qlogic/qla3xxx.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/ethernet/qlogic/qla3xxx.c -+++ b/drivers/net/ethernet/qlogic/qla3xxx.c -@@ -2789,6 +2789,7 @@ static int ql_alloc_large_buffers(struct - netdev_err(qdev->ndev, - "PCI mapping failed with error: %d\n", - err); -+ dev_kfree_skb_irq(skb); - ql_free_large_buffers(qdev); - return -ENOMEM; - } diff --git a/queue-3.16/series b/queue-3.16/series index 00f6b35d..64d2546f 100644 --- a/queue-3.16/series +++ b/queue-3.16/series @@ -39,7 +39,6 @@ net-ipv4-use-a-dedicated-counter-for-icmp_v4-redirect-packets.patch net-ipv4-avoid-mixed-n_redirects-and-rate_tokens-usage.patch sch_dsmark-fix-potential-null-deref-in-dsmark_init.patch nfc-fix-memory-leak-in-llcp_sock_bind.patch -net-qlogic-fix-memory-leak-in-ql_alloc_large_buffers.patch cifs-gracefully-handle-queryinfo-errors-during-open.patch panic-ensure-preemption-is-disabled-during-panic.patch llc-fix-sk_buff-leak-in-llc_sap_state_process.patch |