summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorPaul Hber <phueber@kernsp.in>2017-03-22 11:29:11 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-22 11:29:11 +0000
commitbde4ebb5f94f8dc0f6c29f74c2d8cb62d893010b (patch)
tree9442fe7b155ec11f536f68270ab85b4a2dc0e675 /net
parent0a4171764d905f0d81e1c016cf4364c26ccf5ceb (diff)
parent2cd0afc64e333f2ef62444300418883cff0e79da (diff)
l2tp: avoid use-after-free caused by l2tp_ip_backlog_recv
am: 2cd0afc64e Change-Id: Ib7bcb274c63e13807b1e25f74b6018866e2d8eb1
Diffstat (limited to 'net')
-rw-r--r--net/l2tp/l2tp_ip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index 445b7cd0826a..48ab93842322 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -383,7 +383,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