Skip to content

Commit

Permalink
ping: Check return value of function 'ping_queue_rcv_skb'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Zheng Yongjun authored and davem330 committed Jun 10, 2021
1 parent 3bdd5ee commit 9d44fa3
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions net/ipv4/ping.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand All @@ -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);

Expand Down

0 comments on commit 9d44fa3

Please sign in to comment.