diff options
| author | Zheng Yongjun <zhengyongjun3@huawei.com> | 2021-06-10 04:41:36 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-10 23:44:55 +0300 |
| commit | 9d44fa3e50cc91691896934d106c86e4027e61ca (patch) | |
| tree | 5b20c4edfff230b40e49a3a8900a6c2ee0390490 /net/ipv4/ping.c | |
| parent | 3bdd5ee0ec8c14131d560da492e6df452c6fdd75 (diff) | |
| download | linux-9d44fa3e50cc91691896934d106c86e4027e61ca.tar.xz | |
ping: Check return value of function 'ping_queue_rcv_skb'
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>
Diffstat (limited to 'net/ipv4/ping.c')
| -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 1c9f71a37258..95a718397fd1 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -954,6 +954,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 */ @@ -968,14 +969,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); |