| Message ID | 1355289081-31198-1-git-send-email-herton.krzesinski@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c index 94840d8..80196f3 100644 --- a/net/l2tp/l2tp_eth.c +++ b/net/l2tp/l2tp_eth.c @@ -285,6 +285,7 @@ static int l2tp_eth_create(struct net *net, u32 tunnel_id, u32 session_id, u32 p out_del_dev: free_netdev(dev); + spriv->dev = NULL; out_del_session: l2tp_session_delete(session); out:
This is a note to let you know that I have just added a patch titled l2tp: fix oops in l2tp_eth_create() error path to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Herton ------ From 2a08dea2f2ff16f595243142ea6a7d66403ddbfe Mon Sep 17 00:00:00 2001 From: Tom Parkin <tparkin@katalix.com> Date: Mon, 29 Oct 2012 23:41:48 +0000 Subject: [PATCH] l2tp: fix oops in l2tp_eth_create() error path commit 789336360e0a2aeb9750c16ab704a02cbe035e9e upstream. When creating an L2TPv3 Ethernet session, if register_netdev() should fail for any reason (for example, automatic naming for "l2tpeth%d" interfaces hits the 32k-interface limit), the netdev is freed in the error path. However, the l2tp_eth_sess structure's dev pointer is left uncleared, and this results in l2tp_eth_delete() then attempting to unregister the same netdev later in the session teardown. This results in an oops. To avoid this, clear the session dev pointer in the error path. Signed-off-by: Tom Parkin <tparkin@katalix.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> --- net/l2tp/l2tp_eth.c | 1 + 1 file changed, 1 insertion(+) -- 1.7.9.5