]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
l2tp: avoid use-after-free caused by l2tp_ip_backlog_recv
authorPaul Hüber <phueber@kernsp.in>
Sun, 26 Feb 2017 16:58:19 +0000 (17:58 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 27 Feb 2017 03:57:17 +0000 (22:57 -0500)
l2tp_ip_backlog_recv may not return -1 if the packet gets dropped.
The return value is passed up to ip_local_deliver_finish, which treats
negative values as an IP protocol number for resubmission.

Signed-off-by: Paul Hüber <phueber@kernsp.in>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/l2tp/l2tp_ip.c

index c59712057dc838170f47f917cc3676f9f06f958b..d25038cfd64e1ae5d5819fe1e7049529f4b5a2e4 100644 (file)
@@ -388,7 +388,7 @@ static int l2tp_ip_backlog_recv(struct sock *sk, struct sk_buff *skb)
 drop:
        IP_INC_STATS(sock_net(sk), IPSTATS_MIB_INDISCARDS);
        kfree_skb(skb);
-       return -1;
+       return 0;
 }
 
 /* Userspace will call sendmsg() on the tunnel socket to send L2TP