diff options
author | Eric Dumazet <edumazet@google.com> | 2012-06-06 20:07:20 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 11:47:36 -0400 |
commit | e99e096f4b388824e49ce5c6568eacf46c94438f (patch) | |
tree | d7f144d53e2b464357badedcc81d71b8b5b533a7 | |
parent | 49ffa112f667e1739d8c6352d7f902c8afd45dae (diff) |
net: l2tp_eth: fix kernel panic on rmmod l2tp_eth
[ Upstream commit a06998b88b1651c5f71c0e35f528bf2057188ead ]
We must prevent module unloading if some devices are still attached to
l2tp_eth driver.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Denys Fedoryshchenko <denys@visp.net.lb>
Tested-by: Denys Fedoryshchenko <denys@visp.net.lb>
Cc: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | net/l2tp/l2tp_eth.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c index d2726a74597..3c55f633928 100644 --- a/net/l2tp/l2tp_eth.c +++ b/net/l2tp/l2tp_eth.c | |||
@@ -167,6 +167,7 @@ static void l2tp_eth_delete(struct l2tp_session *session) | |||
167 | if (dev) { | 167 | if (dev) { |
168 | unregister_netdev(dev); | 168 | unregister_netdev(dev); |
169 | spriv->dev = NULL; | 169 | spriv->dev = NULL; |
170 | module_put(THIS_MODULE); | ||
170 | } | 171 | } |
171 | } | 172 | } |
172 | } | 173 | } |
@@ -254,6 +255,7 @@ static int l2tp_eth_create(struct net *net, u32 tunnel_id, u32 session_id, u32 p | |||
254 | if (rc < 0) | 255 | if (rc < 0) |
255 | goto out_del_dev; | 256 | goto out_del_dev; |
256 | 257 | ||
258 | __module_get(THIS_MODULE); | ||
257 | /* Must be done after register_netdev() */ | 259 | /* Must be done after register_netdev() */ |
258 | strlcpy(session->ifname, dev->name, IFNAMSIZ); | 260 | strlcpy(session->ifname, dev->name, IFNAMSIZ); |
259 | 261 | ||