Commit 364700cf authored Apr 06, 2017 by Guillaume Nault Committed by David S. Miller Apr 08, 2017

l2tp: don't mask errors in pppol2tp_setsockopt()



pppol2tp_setsockopt() unconditionally overwrites the error value
returned by pppol2tp_tunnel_setsockopt() or
pppol2tp_session_setsockopt(), thus hiding errors from userspace.

Fixes: fd558d18 ("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>

parent cc663f4d

net/l2tp/l2tp_ppp.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1383,8 +1383,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: