3.16.46-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Guillaume Nault <[email protected]> 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 <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> --- net/l2tp/l2tp_ppp.c | 2 -- 1 file changed, 2 deletions(-) --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -1402,8 +1402,6 @@ static int pppol2tp_setsockopt(struct so } else err = pppol2tp_session_setsockopt(sk, session, optname, val); - err = 0; - end_put_sess: sock_put(sk); end:
