Skip to content

Commit

Permalink
l2tp: avoid use-after-free caused by l2tp_ip_backlog_recv
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Hüber authored and David S. Miller committed Feb 27, 2017
1 parent 1ecc9ad commit 51fb60e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/l2tp/l2tp_ip.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 51fb60e

Please sign in to comment.