raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

ping: Check return value of function 'ping_queue_rcv_skb'

Browse Source 
[ Upstream commit 9d44fa3e50 ]

Function 'ping_queue_rcv_skb' not always return success, which will
also return fail. If not check the wrong return value of it, lead to function
`ping_rcv` return success.

Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Zheng Yongjun
2021-06-10 09:41:36 +08:00
committed by Sasha Levin
parent 08c389de6d
commit 61b132f67c
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
net/ipv4/ping.c
View File

@@ -952,6 +952,7 @@ bool ping_rcv(struct sk_buff *skb)
struct sock *sk; struct sock *sk;
struct net *net = dev_net(skb->dev); struct net *net = dev_net(skb->dev);
struct icmphdr *icmph = icmp_hdr(skb); struct icmphdr *icmph = icmp_hdr(skb);
bool rc = false;
/* We assume the packet has already been checked by icmp_rcv */ /* We assume the packet has already been checked by icmp_rcv */
@@ -966,14 +967,15 @@ bool ping_rcv(struct sk_buff *skb)
struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC); struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
pr_debug("rcv on socket %p\n", sk); pr_debug("rcv on socket %p\n", sk);
if (skb2) if (skb2 && !ping_queue_rcv_skb(sk, skb2))
ping_queue_rcv_skb(sk, skb2); rc = true;
sock_put(sk); sock_put(sk);
return true;
} }
pr_debug("no socket, dropping\n");
return false; if (!rc)
pr_debug("no socket, dropping\n");
return rc;
} }
EXPORT_SYMBOL_GPL(ping_rcv); EXPORT_SYMBOL_GPL(ping_rcv);