Skip to content

Commit 3cf521f

Browse files
sashalevintorvalds
authored andcommitted
net/l2tp: don't fall back on UDP [get|set]sockopt
The l2tp [get|set]sockopt() code has fallen back to the UDP functions for socket option levels != SOL_PPPOL2TP since day one, but that has never actually worked, since the l2tp socket isn't an inet socket. As David Miller points out: "If we wanted this to work, it'd have to look up the tunnel and then use tunnel->sk, but I wonder how useful that would be" Since this can never have worked so nobody could possibly have depended on that functionality, just remove the broken code and return -EINVAL. Reported-by: Sasha Levin <sasha.levin@oracle.com> Acked-by: James Chapman <jchapman@katalix.com> Acked-by: David Miller <davem@davemloft.net> Cc: Phil Turnbull <phil.turnbull@oracle.com> Cc: Vegard Nossum <vegard.nossum@oracle.com> Cc: Willy Tarreau <w@1wt.eu> Cc: stable@vger.kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 1795cd9 commit 3cf521f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Diff for: net/l2tp/l2tp_ppp.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1365,7 +1365,7 @@ static int pppol2tp_setsockopt(struct socket *sock, int level, int optname,
13651365
int err;
13661366

13671367
if (level != SOL_PPPOL2TP)
1368-
return udp_prot.setsockopt(sk, level, optname, optval, optlen);
1368+
return -EINVAL;
13691369

13701370
if (optlen < sizeof(int))
13711371
return -EINVAL;
@@ -1491,7 +1491,7 @@ static int pppol2tp_getsockopt(struct socket *sock, int level, int optname,
14911491
struct pppol2tp_session *ps;
14921492

14931493
if (level != SOL_PPPOL2TP)
1494-
return udp_prot.getsockopt(sk, level, optname, optval, optlen);
1494+
return -EINVAL;
14951495

14961496
if (get_user(len, optlen))
14971497
return -EFAULT;

0 commit comments

Comments
 (0)