netdev - Re: [PATCH] ipv6/sit: fix ipip6_tunnel_get

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Sat, 25 Jun 2022 13:48:06 +0800
From:   Katrin Jo <zys.zljxml@...il.com>
To:     David Ahern <dsahern@...nel.org>
Cc:     linux-kernel@...r.kernel.org, netdev@...r.kernel.org,
        yoshfuji@...ux-ipv6.org, kuba@...nel.org, davem@...emloft.net,
        Eric Dumazet <edumazet@...gle.com>, eric.dumazet@...il.com,
        pabeni@...hat.com, katrinzhou <katrinzhou@...cent.com>
Subject: Re: [PATCH] ipv6/sit: fix ipip6_tunnel_get_prl when memory allocation fails

On Fri, Jun 24, 2022 at 11:12 PM David Ahern <dsahern@...nel.org> wrote:
>
> On 6/24/22 2:12 AM, zys.zljxml@...il.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.

Thanks for reviewing! I sent the V2 patch, modified according to your
suggestion.
The label is removed, and I still use the label "out" instead of "err".

Best Regards,
Katrin