From: David Ahern <dsahern@gmail.com>
To: Zheng Yongjun <zhengyongjun3@huawei.com>,
davem@davemloft.net, yoshfuji@linux-ipv6.org, dsahern@kernel.org,
kuba@kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ping: Check return value of function 'ping_queue_rcv_skb'
Date: Mon, 7 Jun 2021 10:26:15 -0600 [thread overview]
Message-ID: <1c31a9fa-6322-cebb-c78c-189c905eaf86@gmail.com> (raw)
In-Reply-To: <20210607091058.2766648-1-zhengyongjun3@huawei.com>
On 6/7/21 3:10 AM, Zheng Yongjun wrote:
> 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>
> ---
> net/ipv4/ping.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
> index 1c9f71a37258..8e84cde95011 100644
> --- a/net/ipv4/ping.c
> +++ b/net/ipv4/ping.c
> @@ -968,10 +968,11 @@ 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)) {
> + sock_put(sk);
> + return true;
> + }
> sock_put(sk);
> - return true;
> }
> pr_debug("no socket, dropping\n");
>
>
declare a default return variable:
bool rc = false;
set to to true if ping_queue_rcv_skb() fails and have one exit path with
one sock_put.
next prev parent reply other threads:[~2021-06-07 16:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-07 9:10 Zheng Yongjun
2021-06-07 16:26 ` David Ahern [this message]
2021-06-08 1:48 ` 答复: " zhengyongjun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1c31a9fa-6322-cebb-c78c-189c905eaf86@gmail.com \
--to=dsahern@gmail.com \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=yoshfuji@linux-ipv6.org \
--cc=zhengyongjun3@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome