| From: Guillaume Nault <g.nault@alphalink.fr> |
| Date: Wed, 13 Jun 2018 15:09:21 +0200 |
| Subject: l2tp: clean up stale tunnel or session in pppol2tp_connect's error |
| path |
| |
| commit bda06be2158c7aa7e41b15500c4d3840369c19a6 upstream. |
| |
| pppol2tp_connect() may create a tunnel or a session. Remove them in |
| case of error. |
| |
| Fixes: fd558d186df2 ("l2tp: Split pppol2tp patch into separate l2tp and ppp parts") |
| Signed-off-by: Guillaume Nault <g.nault@alphalink.fr> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| net/l2tp/l2tp_ppp.c | 10 ++++++++++ |
| 1 file changed, 10 insertions(+) |
| |
| --- a/net/l2tp/l2tp_ppp.c |
| +++ b/net/l2tp/l2tp_ppp.c |
| @@ -634,6 +634,8 @@ static int pppol2tp_connect(struct socke |
| u32 session_id, peer_session_id; |
| bool drop_refcnt = false; |
| bool drop_tunnel = false; |
| + bool new_session = false; |
| + bool new_tunnel = false; |
| int ver = 2; |
| int fd; |
| |
| @@ -744,6 +746,7 @@ static int pppol2tp_connect(struct socke |
| goto end; |
| } |
| drop_tunnel = true; |
| + new_tunnel = true; |
| } |
| } else { |
| /* Error if we can't find the tunnel */ |
| @@ -817,6 +820,7 @@ static int pppol2tp_connect(struct socke |
| goto end; |
| } |
| drop_refcnt = true; |
| + new_session = true; |
| } |
| |
| /* Special case: if source & dest session_id == 0x0000, this |
| @@ -863,6 +867,12 @@ out_no_ppp: |
| session->name); |
| |
| end: |
| + if (error) { |
| + if (new_session) |
| + l2tp_session_delete(session); |
| + if (new_tunnel) |
| + l2tp_tunnel_delete(tunnel); |
| + } |
| if (drop_refcnt) |
| l2tp_session_dec_refcount(session); |
| if (drop_tunnel) |
