diff options
| author | Guillaume Nault <g.nault@alphalink.fr> | 2017-04-06 18:31:21 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-08 17:29:04 +0200 |
| commit | 321a52a39189d5e4af542f7dcdc07bba4545cf5d (patch) | |
| tree | 198566224a6c5b6a6408faafe8dfbfbcd960cbe9 /net | |
| parent | l2tp: don't mask errors in pppol2tp_setsockopt() (diff) | |
| download | linux-321a52a39189d5e4af542f7dcdc07bba4545cf5d.tar.xz linux-321a52a39189d5e4af542f7dcdc07bba4545cf5d.zip | |
l2tp: don't mask errors in pppol2tp_getsockopt()
pppol2tp_getsockopt() doesn't take into account the error code returned
by pppol2tp_tunnel_getsockopt() or pppol2tp_session_getsockopt(). If
error occurs there, pppol2tp_getsockopt() continues unconditionally and
reports erroneous values.
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/l2tp/l2tp_ppp.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 973a9185b276..32ea0f3d868c 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -1505,8 +1505,13 @@ static int pppol2tp_getsockopt(struct socket *sock, int level, int optname, err = pppol2tp_tunnel_getsockopt(sk, tunnel, optname, &val); sock_put(ps->tunnel_sock); - } else + if (err) + goto end_put_sess; + } else { err = pppol2tp_session_getsockopt(sk, session, optname, &val); + if (err) + goto end_put_sess; + } err = -EFAULT; if (put_user(len, optlen)) |