From: Ethan Tidmore <ethantidmore06@gmail.com>
To: "Philipp Reisner" <philipp.reisner@linbit.com>,
"Lars Ellenberg" <lars.ellenberg@linbit.com>,
"Christoph Böhmwalder" <christoph.boehmwalder@linbit.com>,
"Jens Axboe" <axboe@kernel.dk>
Cc: drbd-dev@lists.linbit.com, linux-block@vger.kernel.org,
linux-kernel@vger.kernel.org,
Ethan Tidmore <ethantidmore06@gmail.com>
Subject: [PATCH 4/4] drbd: Add check for error pointer
Date: Tue, 17 Mar 2026 18:23:18 -0500 [thread overview]
Message-ID: <20260317232318.18923-5-ethantidmore06@gmail.com> (raw)
In-Reply-To: <20260317232318.18923-1-ethantidmore06@gmail.com>
The function find_cfg_context_attr() can return an error pointer or NULL
in its error path.
Change NULL check to IS_ERR_OR_NULL().
Detected by Smatch:
drivers/block/drbd/drbd_nl.c:6571 drbd_adm_dump_paths() error:
'resource_filter' dereferencing possible ERR_PTR()
Fixes: 626c95b0e2a23 ("drbd: rework netlink interface for DRBD 9 multi-peer config")
Signed-off-by: Ethan Tidmore <ethantidmore06@gmail.com>
---
drivers/block/drbd/drbd_nl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index c5e253820ccf..1f458eb972e9 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -6566,7 +6566,7 @@ static int drbd_adm_dump_paths(struct sk_buff *skb, struct netlink_callback *cb)
resource = (struct drbd_resource *)cb->args[0];
if (!cb->args[0]) {
resource_filter = find_cfg_context_attr(cb->nlh, T_ctx_resource_name);
- if (resource_filter) {
+ if (!IS_ERR_OR_NULL(resource_filter)) {
retcode = ERR_RES_NOT_KNOWN;
resource = drbd_find_resource(nla_data(resource_filter));
if (!resource)
--
2.53.0
next prev parent reply other threads:[~2026-03-17 23:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-17 23:23 [PATCH 0/4] drbd: A few bug fixes Ethan Tidmore
2026-03-17 23:23 ` [PATCH 1/4] drbd: Fix out-of-bounds access Ethan Tidmore
2026-03-17 23:23 ` [PATCH 2/4] drbd: Fix variable dereference before check Ethan Tidmore
2026-03-17 23:23 ` [PATCH 3/4] drbd: Add missing error code in drbd_main.c Ethan Tidmore
2026-03-17 23:23 ` Ethan Tidmore [this message]
2026-03-26 14:26 ` [PATCH 4/4] drbd: Add check for error pointer Christoph Böhmwalder
2026-03-26 14:25 ` [PATCH 0/4] drbd: A few bug fixes Christoph Böhmwalder
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=20260317232318.18923-5-ethantidmore06@gmail.com \
--to=ethantidmore06@gmail.com \
--cc=axboe@kernel.dk \
--cc=christoph.boehmwalder@linbit.com \
--cc=drbd-dev@lists.linbit.com \
--cc=lars.ellenberg@linbit.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=philipp.reisner@linbit.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