diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-06-07 00:07:20 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-07-12 04:32:12 +0100 |
| commit | 43f06c88b9293b6bfb5724757c0c9e7d9e2b2103 (patch) | |
| tree | 1574863c0ff51f79c8f74d0075967b9831834114 /net/l2tp | |
| parent | dff31bdf228689241933ea5bf62ba98de3eec42e (diff) | |
| download | kernel_samsung_smdk4412-43f06c88b9293b6bfb5724757c0c9e7d9e2b2103.zip kernel_samsung_smdk4412-43f06c88b9293b6bfb5724757c0c9e7d9e2b2103.tar.gz kernel_samsung_smdk4412-43f06c88b9293b6bfb5724757c0c9e7d9e2b2103.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: Ben Hutchings <ben@decadent.org.uk>
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); |