Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2018-01-12 16:12:14 +0100
committerJohannes Thumshirn <jthumshirn@suse.de>2018-01-12 16:12:17 +0100
commita0468f30454621f6bd6c3b55f8ad4558d63761de (patch)
tree9d0e5a5d52ff95d174ad224cdd010e23041b8e11
parent786f75f89adf3cd1a1b3e0de4c9db1fd3b32aef0 (diff)
s390/qeth: fix early exit from error path (bnc#1072915,
LTC#162173).
-rw-r--r--patches.arch/s390-sles15-02-04-01-qeth-fix-early-exit-from-error-path.patch68
-rw-r--r--series.conf1
2 files changed, 69 insertions, 0 deletions
diff --git a/patches.arch/s390-sles15-02-04-01-qeth-fix-early-exit-from-error-path.patch b/patches.arch/s390-sles15-02-04-01-qeth-fix-early-exit-from-error-path.patch
new file mode 100644
index 0000000000..0810d1bd71
--- /dev/null
+++ b/patches.arch/s390-sles15-02-04-01-qeth-fix-early-exit-from-error-path.patch
@@ -0,0 +1,68 @@
+From: Julian Wiedmann <jwi@linux.vnet.ibm.com>
+Subject: s390/qeth: fix early exit from error path
+Patch-mainline: v4.15-rc1
+Git-commit: 83cf79a2fec3cf499eb6cb9eb608656fc2a82776
+References: bnc#1072915, LTC#162173
+
+Description: qeth: fixes for L3 set_rx_mode improvements
+Symptom: The L3 set_rx_mode improvements introduced some
+ problems that can result in access of uninitialized
+ memory, a blocked refcount and intermittent loss
+ of inbound IPv4 multicast traffic.
+Problem: see individual patch descriptions
+Solution: Apply all relevant fixes.
+Reproduction: -
+
+Upstream-Description:
+
+ s390/qeth: fix early exit from error path
+
+ When the allocation of the addr buffer fails, we need to free
+ our refcount on the inetdevice before returning.
+
+ Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
+ Signed-off-by: David S. Miller <davem@davemloft.net>
+
+
+Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
+Acked-by: Johannes Thumshirn <jthumshirn@suse.de>
+---
+ drivers/s390/net/qeth_l3_main.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/s390/net/qeth_l3_main.c
++++ b/drivers/s390/net/qeth_l3_main.c
+@@ -1553,7 +1553,7 @@ static void qeth_l3_free_vlan_addresses4
+
+ addr = qeth_l3_get_addr_buffer(QETH_PROT_IPV4);
+ if (!addr)
+- return;
++ goto out;
+
+ spin_lock_bh(&card->ip_lock);
+
+@@ -1567,6 +1567,7 @@ static void qeth_l3_free_vlan_addresses4
+ spin_unlock_bh(&card->ip_lock);
+
+ kfree(addr);
++out:
+ in_dev_put(in_dev);
+ }
+
+@@ -1591,7 +1592,7 @@ static void qeth_l3_free_vlan_addresses6
+
+ addr = qeth_l3_get_addr_buffer(QETH_PROT_IPV6);
+ if (!addr)
+- return;
++ goto out;
+
+ spin_lock_bh(&card->ip_lock);
+
+@@ -1606,6 +1607,7 @@ static void qeth_l3_free_vlan_addresses6
+ spin_unlock_bh(&card->ip_lock);
+
+ kfree(addr);
++out:
+ in6_dev_put(in6_dev);
+ #endif /* CONFIG_QETH_IPV6 */
+ }
diff --git a/series.conf b/series.conf
index 3233b0b16a..a22163570c 100644
--- a/series.conf
+++ b/series.conf
@@ -6046,6 +6046,7 @@
patches.drivers/cxgb4-add-tc-flower-support-for-ETH-SMAC-rewrite.patch
patches.drivers/cxgb4-introduce-fw_filter2_wr-to-prepare-for-L3-L4-r.patch
patches.drivers/cxgb4-add-tc-flower-support-for-L3-L4-rewrite.patch
+ patches.arch/s390-sles15-02-04-01-qeth-fix-early-exit-from-error-path.patch
patches.drivers/Bluetooth-hci_bcm-Add-support-for-BCM2E7E
patches.drivers/bnxt-Move-generic-devlink-code-to-new-file.patch
patches.drivers/cxgb4-fix-overflow-in-collecting-IBQ-and-OBQ-dump.patch