net/l2tp: don't fall back on UDP [get|set]sockopt
authorSasha Levin <>
Tue, 15 Jul 2014 00:02:31 +0000 (17:02 -0700)
committerBen Hutchings <>
Wed, 6 Aug 2014 17:07:37 +0000 (18:07 +0100)
commit 3cf521f7dc87c031617fd47e4b7aa2593c2f3daf upstream.

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 <>
Acked-by: James Chapman <>
Acked-by: David Miller <>
Cc: Phil Turnbull <>
Cc: Vegard Nossum <>
Cc: Willy Tarreau <>
Signed-off-by: Linus Torvalds <>
Signed-off-by: Ben Hutchings <>

index e0f0934..437fb59 100644 (file)
@@ -1351,7 +1351,7 @@ static int pppol2tp_setsockopt(struct socket *sock, int level, int optname,
        int err;
        if (level != SOL_PPPOL2TP)
-               return udp_prot.setsockopt(sk, level, optname, optval, optlen);
+               return -EINVAL;
        if (optlen < sizeof(int))
                return -EINVAL;
@@ -1477,7 +1477,7 @@ static int pppol2tp_getsockopt(struct socket *sock, int level,
        struct pppol2tp_session *ps;
        if (level != SOL_PPPOL2TP)
-               return udp_prot.getsockopt(sk, level, optname, optval, optlen);
+               return -EINVAL;
        if (get_user(len, (int __user *) optlen))
                return -EFAULT;