Home Home > GIT Browse > SLE12-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-10-11 16:00:42 +0200
committerJiri Slaby <jslaby@suse.cz>2019-10-16 10:57:19 +0200
commit81afbc391d5220bf4141187a83ec263c945457e7 (patch)
tree4b616274b4f243317d0c4f059e51e35889fdb2f2
parentd8d898b81cb80dd97df291ea00dc3d5d2ce23823 (diff)
bridge/mdb: remove wrong use of NLM_F_MULTI
(networking-stable-19_09_15).
-rw-r--r--patches.suse/bridge-mdb-remove-wrong-use-of-NLM_F_MULTI.patch33
-rw-r--r--series.conf1
2 files changed, 34 insertions, 0 deletions
diff --git a/patches.suse/bridge-mdb-remove-wrong-use-of-NLM_F_MULTI.patch b/patches.suse/bridge-mdb-remove-wrong-use-of-NLM_F_MULTI.patch
new file mode 100644
index 0000000000..f6e468ded0
--- /dev/null
+++ b/patches.suse/bridge-mdb-remove-wrong-use-of-NLM_F_MULTI.patch
@@ -0,0 +1,33 @@
+From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
+Date: Fri, 6 Sep 2019 11:47:02 +0200
+Subject: bridge/mdb: remove wrong use of NLM_F_MULTI
+Git-commit: 94a72b3f024fc7e9ab640897a1e38583a470659d
+Patch-mainline: 5.3
+References: networking-stable-19_09_15
+
+NLM_F_MULTI must be used only when a NLMSG_DONE message is sent at the end.
+In fact, NLMSG_DONE is sent only at the end of a dump.
+
+Libraries like libnl will wait forever for NLMSG_DONE.
+
+Fixes: 949f1e39a617 ("bridge: mdb: notify on router port add and del")
+CC: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
+Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
+Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ net/bridge/br_mdb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/bridge/br_mdb.c
++++ b/net/bridge/br_mdb.c
+@@ -372,7 +372,7 @@ static int nlmsg_populate_rtr_fill(struc
+ struct nlmsghdr *nlh;
+ struct nlattr *nest;
+
+- nlh = nlmsg_put(skb, pid, seq, type, sizeof(*bpm), NLM_F_MULTI);
++ nlh = nlmsg_put(skb, pid, seq, type, sizeof(*bpm), 0);
+ if (!nlh)
+ return -EMSGSIZE;
+
diff --git a/series.conf b/series.conf
index e72ee99d0b..3ce748a790 100644
--- a/series.conf
+++ b/series.conf
@@ -24545,6 +24545,7 @@
patches.suse/isdn-capi-check-message-length-in-capi_write.patch
patches.suse/net-gso-Fix-skb_segment-splat-when-splitting-gso_siz.patch
patches.suse/net-ibmvnic-Fix-missing-in-__ibmvnic_reset.patch
+ patches.suse/bridge-mdb-remove-wrong-use-of-NLM_F_MULTI.patch
patches.suse/ixgbe-Prevent-u8-wrapping-of-ITR-value-to-something-.patch
patches.suse/tpm_tis_core-Set-TPM_CHIP_FLAG_IRQ-before-probing-fo.patch
patches.suse/edac-amd64-decode-syndrome-before-translating-address.patch