Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230407035058.8373-1-iccccc@hust.edu.cn>
In-Reply-To: <20230407035058.8373-1-iccccc@hust.edu.cn>
From:   Eric Dumazet <edumazet@google.com>
Date:   Fri, 7 Apr 2023 11:00:55 +0200
Message-ID: <CANn89i+FFu3Rz8KgMw-hn=jPcv9AJfQKuAgUyfzVMwACLQMUSA@mail.gmail.com>
Subject: Re: [PATCH net-next] net/ipv6: silence 'passing zero to ERR_PTR()' warning
To:     Haoyi Liu <iccccc@hust.edu.cn>
Cc:     "David S. Miller" <davem@davemloft.net>,
        David Ahern <dsahern@kernel.org>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        hust-os-kernel-patches@googlegroups.com, yalongz@hust.edu.cn,
        error27@gmail.com, Dongliang Mu <dzm91@hust.edu.cn>,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, Apr 7, 2023 at 5:54=E2=80=AFAM Haoyi Liu <iccccc@hust.edu.cn> wrote=
:
>
> Smatch complains that if xfrm_lookup() returns NULL then this does a
> weird thing with "err":
>
>     net/ ipv6/ icmp.c:411 icmpv6_route_lookup()
>     warn: passing zero to ERR_PTR()
>
> Just return "dst2" directly instead of assigning it to"dst" and then
> looking up the value of "err".  No functional change.
>
> Signed-off-by: Haoyi Liu <iccccc@hust.edu.cn>
> Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
> ---
> The issue is found by static analysis, and the patch is remains untested.
> ---
>  net/ipv6/icmp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
> index 1f53f2a74480..a5e77acead89 100644
> --- a/net/ipv6/icmp.c
> +++ b/net/ipv6/icmp.c
> @@ -395,7 +395,7 @@ static struct dst_entry *icmpv6_route_lookup(struct n=
et *net,
>         dst2 =3D xfrm_lookup(net, dst2, flowi6_to_flowi(&fl2), sk, XFRM_L=
OOKUP_ICMP);
>         if (!IS_ERR(dst2)) {
>                 dst_release(dst);
> -               dst =3D dst2;
> +               return dst2;
>         } else {
>                 err =3D PTR_ERR(dst2);
>                 if (err =3D=3D -EPERM) {
> --
> 2.25.1
>

Please cleanup this thing, this is a maze of returns, gotos, and
unnecessary 'else's

Thanks.

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 1f53f2a74480c0b8433204b567e7f98ad1216ad6..c76861f1ff6e4ee12d2686c1d13=
5b24595989dfa
100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -395,14 +395,12 @@ static struct dst_entry
*icmpv6_route_lookup(struct net *net,
        dst2 =3D xfrm_lookup(net, dst2, flowi6_to_flowi(&fl2), sk,
XFRM_LOOKUP_ICMP);
        if (!IS_ERR(dst2)) {
                dst_release(dst);
-               dst =3D dst2;
-       } else {
-               err =3D PTR_ERR(dst2);
-               if (err =3D=3D -EPERM) {
-                       dst_release(dst);
-                       return dst2;
-               } else
-                       goto relookup_failed;
+               return dst2;
+       }
+       err =3D PTR_ERR(dst2);
+       if (err =3D=3D -EPERM) {
+               dst_release(dst);
+               return dst2;
        }

 relookup_failed: