From 903ba5f616e0531364cfdc04e310f3e16b9b17e3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 27 Jan 2016 07:47:13 -0800 Subject: [PATCH] delete queue-3.14/vxlan-fix-test-which-detect-duplicate-vxlan-iface.patch --- queue-3.14/series | 1 - ...t-which-detect-duplicate-vxlan-iface.patch | 78 ------------------- 2 files changed, 79 deletions(-) delete mode 100644 queue-3.14/vxlan-fix-test-which-detect-duplicate-vxlan-iface.patch diff --git a/queue-3.14/series b/queue-3.14/series index f79f397038d..a1b86a43d75 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -35,7 +35,6 @@ connector-bump-skb-users-before-callback-invocation.patch unix-properly-account-for-fds-passed-over-unix-sockets.patch bridge-only-call-sbin-bridge-stp-for-the-initial-network-namespace.patch net-possible-use-after-free-in-dst_release.patch -vxlan-fix-test-which-detect-duplicate-vxlan-iface.patch net-sctp-prevent-writes-to-cookie_hmac_alg-from-accessing-invalid-memory.patch tcp_yeah-don-t-set-ssthresh-below-2.patch bonding-prevent-ipv6-link-local-address-on-enslaved-devices.patch diff --git a/queue-3.14/vxlan-fix-test-which-detect-duplicate-vxlan-iface.patch b/queue-3.14/vxlan-fix-test-which-detect-duplicate-vxlan-iface.patch deleted file mode 100644 index c793f381a37..00000000000 --- a/queue-3.14/vxlan-fix-test-which-detect-duplicate-vxlan-iface.patch +++ /dev/null @@ -1,78 +0,0 @@ -From foo@baz Tue Jan 26 22:23:35 PST 2016 -From: Nicolas Dichtel -Date: Thu, 7 Jan 2016 11:26:53 +0100 -Subject: vxlan: fix test which detect duplicate vxlan iface -Content-Length: 2895 -Lines: 75 - -From: Nicolas Dichtel - -[ Upstream commit 07b9b37c227cb8d88d478b4a9c5634fee514ede1 ] - -When a vxlan interface is created, the driver checks that there is not -another vxlan interface with the same properties. To do this, it checks -the existing vxlan udp socket. Since commit 1c51a9159dde, the creation of -the vxlan socket is done only when the interface is set up, thus it breaks -that test. - -Example: -$ ip l a vxlan10 type vxlan id 10 group 239.0.0.10 dev eth0 dstport 0 -$ ip l a vxlan11 type vxlan id 10 group 239.0.0.10 dev eth0 dstport 0 -$ ip -br l | grep vxlan -vxlan10 DOWN f2:55:1c:6a:fb:00 -vxlan11 DOWN 7a:cb:b9:38:59:0d - -Instead of checking sockets, let's loop over the vxlan iface list. - -Fixes: 1c51a9159dde ("vxlan: fix race caused by dropping rtnl_unlock") -Reported-by: Thomas Faivre -Signed-off-by: Nicolas Dichtel -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/vxlan.c | 12 ++++++++---- - include/net/vxlan.h | 5 +++++ - 2 files changed, 13 insertions(+), 4 deletions(-) - ---- a/drivers/net/vxlan.c -+++ b/drivers/net/vxlan.c -@@ -2607,7 +2607,7 @@ static int vxlan_newlink(struct net *net - struct nlattr *tb[], struct nlattr *data[]) - { - struct vxlan_net *vn = net_generic(net, vxlan_net_id); -- struct vxlan_dev *vxlan = netdev_priv(dev); -+ struct vxlan_dev *vxlan = netdev_priv(dev), *tmp; - struct vxlan_rdst *dst = &vxlan->default_dst; - __u32 vni; - int err; -@@ -2715,9 +2715,13 @@ static int vxlan_newlink(struct net *net - if (data[IFLA_VXLAN_PORT]) - vxlan->dst_port = nla_get_be16(data[IFLA_VXLAN_PORT]); - -- if (vxlan_find_vni(net, vni, use_ipv6 ? AF_INET6 : AF_INET, -- vxlan->dst_port)) { -- pr_info("duplicate VNI %u\n", vni); -+ list_for_each_entry(tmp, &vn->vxlan_list, next) { -+ if (tmp->default_dst.remote_vni == vni && -+ (tmp->default_dst.remote_ip.sa.sa_family == AF_INET6 || -+ tmp->saddr.sa.sa_family == AF_INET6) == use_ipv6 && -+ tmp->dst_port == vxlan->dst_port && -+ (tmp->flags & VXLAN_F_RCV_FLAGS) == -+ (vxlan->flags & VXLAN_F_RCV_FLAGS)) - return -EEXIST; - } - ---- a/include/net/vxlan.h -+++ b/include/net/vxlan.h -@@ -24,6 +24,11 @@ struct vxlan_sock { - struct udp_offload udp_offloads; - }; - -+/* Flags that are used in the receive path. These flags must match in -+ * order for a socket to be shareable -+ */ -+#define VXLAN_F_RCV_FLAGS VXLAN_F_UDP_ZERO_CSUM6_RX -+ - struct vxlan_sock *vxlan_sock_add(struct net *net, __be16 port, - vxlan_rcv_t *rcv, void *data, - bool no_share, bool ipv6); -- 2.47.3