diff options
| author | Paul Hüber <phueber@kernsp.in> | 2017-02-26 17:58:19 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-10-12 15:28:11 +0100 |
| commit | b97f7773a3aa57402868958eab4560b7de317287 (patch) | |
| tree | ee813f08da6c89e9077a90d7c489e4216c70e40f | |
| parent | 8a7b081660857a80c3efc463b3da790c4fa0c801 (diff) | |
| download | linux-stable-b97f7773a3aa57402868958eab4560b7de317287.tar.gz linux-stable-b97f7773a3aa57402868958eab4560b7de317287.tar.bz2 linux-stable-b97f7773a3aa57402868958eab4560b7de317287.zip | |
l2tp: avoid use-after-free caused by l2tp_ip_backlog_recv
commit 51fb60eb162ab84c5edf2ae9c63cf0b878e5547e upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | net/l2tp/l2tp_ip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c index 1ecc71ce8cae..d30f5c03d72f 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c @@ -390,7 +390,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 |