diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-06-07 00:07:20 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 08:47:36 -0700 |
| commit | e99e096f4b388824e49ce5c6568eacf46c94438f (patch) | |
| tree | d7f144d53e2b464357badedcc81d71b8b5b533a7 /net/l2tp | |
| parent | 49ffa112f667e1739d8c6352d7f902c8afd45dae (diff) | |
| download | kernel_samsung_smdk4412-e99e096f4b388824e49ce5c6568eacf46c94438f.zip kernel_samsung_smdk4412-e99e096f4b388824e49ce5c6568eacf46c94438f.tar.gz kernel_samsung_smdk4412-e99e096f4b388824e49ce5c6568eacf46c94438f.tar.bz2 | |
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>
Diffstat (limited to 'net/l2tp')
| -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 d2726a7..3c55f63 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) if (dev) { unregister_netdev(dev); spriv->dev = NULL; + module_put(THIS_MODULE); } } } @@ -254,6 +255,7 @@ static int l2tp_eth_create(struct net *net, u32 tunnel_id, u32 session_id, u32 p if (rc < 0) goto out_del_dev; + __module_get(THIS_MODULE); /* Must be done after register_netdev() */ strlcpy(session->ifname, dev->name, IFNAMSIZ); |