diff options
| author | Zheng Yongjun <zhengyongjun3@huawei.com> | 2021-06-10 04:41:36 +0300 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2021-06-30 15:48:57 +0300 |
| commit | e1df54a22b5ced83a6fa49cc05d2912e6607a720 (patch) | |
| tree | be791d8dda99a77748bb4dce9a50fde5f6d94a5f | |
| parent | a1440a9ab87ae6d38a25b740966cc8eb55b6076e (diff) | |
| download | linux-e1df54a22b5ced83a6fa49cc05d2912e6607a720.tar.xz | |
ping: Check return value of function 'ping_queue_rcv_skb'
[ Upstream commit 9d44fa3e50cc91691896934d106c86e4027e61ca ]
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>
| -rw-r--r-- | net/ipv4/ping.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 186fdf0922d2..aab141c4a389 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -978,6 +978,7 @@ bool ping_rcv(struct sk_buff *skb) struct sock *sk; struct net *net = dev_net(skb->dev); struct icmphdr *icmph = icmp_hdr(skb); + bool rc = false; /* We assume the packet has already been checked by icmp_rcv */ @@ -992,14 +993,15 @@ bool ping_rcv(struct sk_buff *skb) struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC); pr_debug("rcv on socket %p\n", sk); - if (skb2) - ping_queue_rcv_skb(sk, skb2); + if (skb2 && !ping_queue_rcv_skb(sk, skb2)) + rc = true; 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); |