diff options
| author | Paul Hüber <phueber@kernsp.in> | 2017-02-26 19:58:19 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-18 08:55:52 +0300 |
| commit | ca23526b4bb3f71d4ecb8ce1bcb1d97b5e743bdb (patch) | |
| tree | cb4ddff2dbb2e6800beb303a02f138aa71ebc843 /net/l2tp | |
| parent | 9f9f73d5c3afd0d80e22425d85c837a98f4add0b (diff) | |
| download | linux-ca23526b4bb3f71d4ecb8ce1bcb1d97b5e743bdb.tar.xz | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/l2tp')
| -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 5743ab0d8dc6..c2cd3dd7fa67 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c @@ -382,7 +382,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 |