From: Guillaume Nault Date: Thu, 6 Apr 2017 16:31:20 +0000 (+0200) Subject: l2tp: don't mask errors in pppol2tp_setsockopt() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=364700cf8fd54f54ad08313464105a414e3bccb7;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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: fd558d186df2 ("l2tp: Split pppol2tp patch into separate l2tp and ppp parts") Signed-off-by: Guillaume Nault Signed-off-by: David S. Miller --- diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 861b255a2d51..973a9185b276 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -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: