Skip to contentSkip to conversation

Patch "vxlan: re-ignore EADDRINUSE from igmp_join" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Sep 30, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

vxlan: re-ignore EADDRINUSE from igmp_join

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
vxlan-re-ignore-eaddrinuse-from-igmp_join.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Wed Sep 30 05:18:31 CEST 2015

From: Marcelo Ricardo Leitner <[email protected]>
Date: Tue, 25 Aug 2015 20:22:35 -0300
Subject: vxlan: re-ignore EADDRINUSE from igmp_join

From: Marcelo Ricardo Leitner <[email protected]>

[ Upstream commit bef0057b7ba881d5ae67eec876df7a26fe672a59 ]

Before 56ef9c909b40[1] it used to ignore all errors from igmp_join(). That commit enhanced that and made it error out whatever error happened with igmp_join(), but that's not good because when using multicast groups vxlan will try to join it multiple times if the socket is reused and then the 2nd and further attempts will fail with EADDRINUSE.

As we don't track to which groups the socket is already subscribed, it's okay to just ignore that error.

Fixes 56ef9c909b40 ("vxlan: Move socket initialization to within rtnl scope")
---
 drivers/net/vxlan.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/net/vxlan.c +2 -0
@@ -2212,6 +2212,8 @@ static int vxlan_open(struct net_device
 
 	if (vxlan_addr_multicast(&vxlan->default_dst.remote_ip)) {
 		ret = vxlan_igmp_join(vxlan);
+		if (ret == -EADDRINUSE)
+			ret = 0;
 		if (ret) {
 			vxlan_sock_release(vs);
 			return ret;

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/vxlan-re-ignore-eaddrinuse-from-igmp_join.patch queue-4.1/sctp-fix-race-on-protocol-netns-initialization.patch