From: Haoyi Liu <iccccc@hust.edu.cn>
To: "David S. Miller" <davem@davemloft.net>,
David Ahern <dsahern@kernel.org>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: hust-os-kernel-patches@googlegroups.com, yalongz@hust.edu.cn,
error27@gmail.com, Haoyi Liu <iccccc@hust.edu.cn>,
Dongliang Mu <dzm91@hust.edu.cn>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net-next v2] net/ipv6: silence 'passing zero to ERR_PTR()' warning
Date: Thu, 13 Apr 2023 10:10:05 +0000 [thread overview]
Message-ID: <20230413101005.7504-1-iccccc@hust.edu.cn> (raw)
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()
Merge conditional paths and remove unnecessary 'else'. No functional
change.
Signed-off-by: Haoyi Liu <iccccc@hust.edu.cn>
Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
---
v1->v2: Remove unnecessary 'else'.
The issue is found by static analysis, and the patch is remains untested.
---
net/ipv6/icmp.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 1f53f2a74480..a12eef11c7ee 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -393,17 +393,12 @@ static struct dst_entry *icmpv6_route_lookup(struct net *net,
goto relookup_failed;
dst2 = xfrm_lookup(net, dst2, flowi6_to_flowi(&fl2), sk, XFRM_LOOKUP_ICMP);
- if (!IS_ERR(dst2)) {
- dst_release(dst);
- dst = dst2;
- } else {
- err = PTR_ERR(dst2);
- if (err == -EPERM) {
- dst_release(dst);
- return dst2;
- } else
- goto relookup_failed;
- }
+ err = PTR_ERR_OR_ZERO(dst2);
+ if (err && err != -EPERM)
+ goto relookup_failed;
+
+ dst_release(dst);
+ return dst2; /* returns success or ERR_PTR(-EPERM) */
relookup_failed:
if (dst)
--
2.40.0
next reply other threads:[~2023-04-13 10:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-13 10:10 Haoyi Liu [this message]
2023-04-13 22:50 ` Jacob Keller
2023-04-14 0:32 ` David Ahern
2023-04-14 6:32 ` Dan Carpenter
2023-04-18 2:17 ` Jakub Kicinski
2023-04-18 20:46 ` David Ahern
2023-05-11 14:52 ` 刘浩毅
2023-05-11 15:38 ` Jakub Kicinski
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=20230413101005.7504-1-iccccc@hust.edu.cn \
--to=iccccc@hust.edu.cn \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=dzm91@hust.edu.cn \
--cc=edumazet@google.com \
--cc=error27@gmail.com \
--cc=hust-os-kernel-patches@googlegroups.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=yalongz@hust.edu.cn \
/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
all inboxes | Powered by JetHome®