From: David Ahern <dsahern@kernel.org>
To: zys.zljxml@gmail.com, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, yoshfuji@linux-ipv6.org
Cc: kuba@kernel.org, davem@davemloft.net, edumazet@google.com,
eric.dumazet@gmail.com, pabeni@redhat.com,
katrinzhou <katrinzhou@tencent.com>
Subject: Re: [PATCH] ipv6/sit: fix ipip6_tunnel_get_prl when memory allocation fails
Date: Fri, 24 Jun 2022 09:12:52 -0600 [thread overview]
Message-ID: <ad7673eb-ff0d-ce39-e05d-6af3be5ac68c@kernel.org> (raw)
In-Reply-To: <20220624081254.1251316-1-zys.zljxml@gmail.com>
On 6/24/22 2:12 AM, zys.zljxml@gmail.com wrote:
> diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
> index c0b138c20992..4fb84c0b30be 100644
> --- a/net/ipv6/sit.c
> +++ b/net/ipv6/sit.c
> @@ -323,8 +323,6 @@ static int ipip6_tunnel_get_prl(struct net_device *dev, struct ip_tunnel_prl __u
> kcalloc(cmax, sizeof(*kp), GFP_KERNEL_ACCOUNT | __GFP_NOWARN) :
> NULL;
>
> - rcu_read_lock();
> -
> ca = min(t->prl_count, cmax);
>
> if (!kp) {
> @@ -337,11 +335,12 @@ static int ipip6_tunnel_get_prl(struct net_device *dev, struct ip_tunnel_prl __u
> __GFP_NOWARN);
> if (!kp) {
> ret = -ENOMEM;
> - goto out;
> + goto err;
> }
> }
>
> c = 0;
> + rcu_read_lock();
> for_each_prl_rcu(t->prl) {
> if (c >= cmax)
> break;
> @@ -362,7 +361,7 @@ static int ipip6_tunnel_get_prl(struct net_device *dev, struct ip_tunnel_prl __u
> ret = -EFAULT;
>
> kfree(kp);
> -
> +err:
> return ret;
> }
>
'out' label is no longer used and should be removed.
next prev parent reply other threads:[~2022-06-24 15:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-24 8:12 [PATCH] ipv6/sit: fix ipip6_tunnel_get_prl when memory allocation fails zys.zljxml
2022-06-24 15:12 ` David Ahern [this message]
2022-06-25 5:48 ` Katrin Jo
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=ad7673eb-ff0d-ce39-e05d-6af3be5ac68c@kernel.org \
--to=dsahern@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=eric.dumazet@gmail.com \
--cc=katrinzhou@tencent.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=yoshfuji@linux-ipv6.org \
--cc=zys.zljxml@gmail.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