From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>
Cc: Pravin Shelar <pshelar@nicira.com>,
Nicolas Dichtel <nicolas.dichtel@6wind.com>,
netdev@vger.kernel.org
Subject: [PATCH net 4/4] ip_tunnel: Remove double unregister of the fallback device
Date: Tue, 1 Oct 2013 11:37:37 +0200 [thread overview]
Message-ID: <20131001093737.GJ7660@secunet.com> (raw)
In-Reply-To: <20131001093359.GG7660@secunet.com>
When queueing the netdevices for removal, we queue the
fallback device twice in ip_tunnel_destroy(). The first
time when we queue all netdevices in the namespace and
then again explicitly. Fix this by removing the explicit
queueing of the fallback device.
Bug was introduced when network namespace support was added
with commit 6c742e714d8 ("ipip: add x-netns support").
Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
net/ipv4/ip_tunnel.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 895a353..63a6d6d 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -886,8 +886,6 @@ static void ip_tunnel_destroy(struct ip_tunnel_net *itn, struct list_head *head,
if (!net_eq(dev_net(t->dev), net))
unregister_netdevice_queue(t->dev, head);
}
- if (itn->fb_tunnel_dev)
- unregister_netdevice_queue(itn->fb_tunnel_dev, head);
}
void ip_tunnel_delete_net(struct ip_tunnel_net *itn, struct rtnl_link_ops *ops)
--
1.7.9.5
next prev parent reply other threads:[~2013-10-01 9:37 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-01 9:33 [PATCH net v2 1/4] ip_tunnel: Fix a memory corruption in ip_tunnel_xmit Steffen Klassert
2013-10-01 9:34 ` [PATCH net v2 2/4] ip_tunnel: Add fallback tunnels to the hash lists Steffen Klassert
2013-10-01 16:43 ` David Miller
2013-10-01 9:35 ` [PATCH net 3/4] ip_tunnel_core: Change __skb_push back to skb_push Steffen Klassert
2013-10-01 16:43 ` David Miller
2013-10-01 9:37 ` Steffen Klassert [this message]
2013-10-01 10:00 ` [PATCH net 4/4] ip_tunnel: Remove double unregister of the fallback device Nicolas Dichtel
2013-10-01 10:40 ` Steffen Klassert
2013-10-01 11:30 ` Nicolas Dichtel
2013-10-01 16:04 ` [PATCH net 1/2] sit: allow to use rtnl ops on fb tunnel Nicolas Dichtel
2013-10-01 16:05 ` [PATCH net 2/2] ip6tnl: " Nicolas Dichtel
2013-10-01 16:59 ` David Miller
2013-10-02 7:16 ` Nicolas Dichtel
2013-10-01 16:59 ` [PATCH net 1/2] sit: " David Miller
2013-10-02 7:15 ` Nicolas Dichtel
2013-10-02 7:36 ` Nicolas Dichtel
2013-10-02 21:08 ` David Miller
2013-10-03 8:06 ` Nicolas Dichtel
2013-10-03 17:37 ` David Miller
2013-10-21 23:30 ` Willem de Bruijn
2013-10-22 7:34 ` Nicolas Dichtel
2013-10-01 16:43 ` [PATCH net 4/4] ip_tunnel: Remove double unregister of the fallback device David Miller
2013-10-01 16:43 ` [PATCH net v2 1/4] ip_tunnel: Fix a memory corruption in ip_tunnel_xmit David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131001093737.GJ7660@secunet.com \
--to=steffen.klassert@secunet.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=nicolas.dichtel@6wind.com \
--cc=pshelar@nicira.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.