Commit 9d44fa3e authored by Zheng Yongjun's avatar Zheng Yongjun Committed by David S. Miller

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: default avatarZheng Yongjun <zhengyongjun3@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3bdd5ee0
...@@ -954,6 +954,7 @@ bool ping_rcv(struct sk_buff *skb) ...@@ -954,6 +954,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 */
...@@ -968,14 +969,15 @@ bool ping_rcv(struct sk_buff *skb) ...@@ -968,14 +969,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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment