diff options
| author | Guillaume Nault <g.nault@alphalink.fr> | 2017-04-06 18:31:20 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-07-18 18:38:41 +0100 |
| commit | 7fa07017833f62c0c27e4ca15ab7a43b9dd71b15 (patch) | |
| tree | 2d83d1a9761e71688f3fc70ef17a1e8394fa167d | |
| parent | 3e8dbd069c401b29f760b69dca571fd091697b80 (diff) | |
| download | linux-7fa07017833f62c0c27e4ca15ab7a43b9dd71b15.tar.gz linux-7fa07017833f62c0c27e4ca15ab7a43b9dd71b15.tar.bz2 linux-7fa07017833f62c0c27e4ca15ab7a43b9dd71b15.zip | |
l2tp: don't mask errors in pppol2tp_setsockopt()
commit 364700cf8fd54f54ad08313464105a414e3bccb7 upstream.
pppol2tp_setsockopt() unconditionally overwrites the error value
returned by pppol2tp_tunnel_setsockopt() or
pppol2tp_session_setsockopt(), thus hiding errors from userspace.
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>
| -rw-r--r-- | net/l2tp/l2tp_ppp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index c404a6a8dd74..a49964f84f1b 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -1387,8 +1387,6 @@ static int pppol2tp_setsockopt(struct socket *sock, int level, int optname, } else err = pppol2tp_session_setsockopt(sk, session, optname, val); - err = 0; - end_put_sess: sock_put(sk); end: |