From: Haotian Zhang <vulab@iscas.ac.cn>
To: Andrew Morton <akpm@linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Kuan-Wei Chiu <visitorckw@gmail.com>
Cc: linux-kernel@vger.kernel.org, Haotian Zhang <vulab@iscas.ac.cn>
Subject: [PATCH v3] debugobjects: Fix inconsistent return handling and potential ERR_PTR dereference
Date: Fri, 14 Nov 2025 09:56:31 +0800 [thread overview]
Message-ID: <20251114015631.1729-1-vulab@iscas.ac.cn> (raw)
In-Reply-To: <20251110075746.1680-1-vulab@iscas.ac.cn>
The lookup_object_or_alloc() function can return NULL on memory
allocation failure, while returning an error pointer for other errors.
Call sites such as __debug_object_init() and debug_object_activate()
only check for errors using IS_ERR(), which does not evaluate to true
for a NULL pointer. This can lead to a NULL pointer dereference if
memory allocation fails.
To fix this, modify lookup_object_or_alloc() to consistently return
ERR_PTR(-ENOMEM) on allocation failure. This ensures that all error
paths return a valid error pointer that can be caught by IS_ERR().
Update all three call sites (__debug_object_init, debug_object_activate,
and debug_object_assert_init) to use IS_ERR() for error checking and
handle -ENOMEM by calling debug_objects_oom(), thus preventing the
potential bug and making the error handling robust and consistent.
Fixes: 63a759694eed ("debugobject: Prevent init race with static objects")
Suggested-by: Kuan-Wei Chiu <visitorckw@gmail.com>
Signed-off-by: Haotian Zhang <vulab@iscas.ac.cn>
---
Changes in v3:
-Reword commit message to clearly describe the NULL pointer
dereference bug, as suggested by Kuan-Wei Chiu.
-Change subject prefix to "debugobjects:".
---
Changes in v2:
-Make error handling consistent across all call sites as suggested
by Kuan-Wei Chiu
---
lib/debugobjects.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index 7f50c4480a4e..d2d1979e2d12 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -691,7 +691,7 @@ static struct debug_obj *lookup_object_or_alloc(void *addr, struct debug_bucket
/* Out of memory. Do the cleanup outside of the locked region */
debug_objects_enabled = false;
- return NULL;
+ return ERR_PTR(-ENOMEM);
}
static void debug_objects_fill_pool(void)
@@ -741,9 +741,10 @@ __debug_object_init(void *addr, const struct debug_obj_descr *descr, int onstack
raw_spin_lock_irqsave(&db->lock, flags);
obj = lookup_object_or_alloc(addr, db, descr, onstack, false);
- if (unlikely(!obj)) {
+ if (IS_ERR(obj)) {
raw_spin_unlock_irqrestore(&db->lock, flags);
- debug_objects_oom();
+ if (PTR_ERR(obj) == -ENOMEM)
+ debug_objects_oom();
return;
}
@@ -818,11 +819,13 @@ int debug_object_activate(void *addr, const struct debug_obj_descr *descr)
raw_spin_lock_irqsave(&db->lock, flags);
obj = lookup_object_or_alloc(addr, db, descr, false, true);
- if (unlikely(!obj)) {
- raw_spin_unlock_irqrestore(&db->lock, flags);
- debug_objects_oom();
- return 0;
- } else if (likely(!IS_ERR(obj))) {
+ if (IS_ERR(obj)) {
+ if (PTR_ERR(obj) == -ENOMEM) {
+ raw_spin_unlock_irqrestore(&db->lock, flags);
+ debug_objects_oom();
+ return 0;
+ }
+ } else {
switch (obj->state) {
case ODEBUG_STATE_ACTIVE:
case ODEBUG_STATE_DESTROYED:
@@ -1007,11 +1010,11 @@ void debug_object_assert_init(void *addr, const struct debug_obj_descr *descr)
raw_spin_lock_irqsave(&db->lock, flags);
obj = lookup_object_or_alloc(addr, db, descr, false, true);
raw_spin_unlock_irqrestore(&db->lock, flags);
- if (likely(!IS_ERR_OR_NULL(obj)))
+ if (!IS_ERR(obj))
return;
/* If NULL the allocation has hit OOM */
- if (!obj) {
+ if (PTR_ERR(obj) == -ENOMEM) {
debug_objects_oom();
return;
}
--
2.50.1.windows.1
next prev parent reply other threads:[~2025-11-14 1:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-10 7:57 [PATCH] debug: Fix a NULL vs IS_ERR() bug in __debug_object_init() Haotian Zhang
2025-11-10 13:39 ` Kuan-Wei Chiu
2025-11-11 2:15 ` [PATCH v2] debug: Fix a mixed use of NULL and error pointers Haotian Zhang
2025-11-13 19:49 ` Kuan-Wei Chiu
2025-11-13 20:03 ` Kuan-Wei Chiu
2025-11-14 1:56 ` Haotian Zhang [this message]
2025-11-15 23:18 ` [PATCH v3] debugobjects: Fix inconsistent return handling and potential ERR_PTR dereference Thomas Gleixner
2025-11-16 18:08 ` Thomas Gleixner
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=20251114015631.1729-1-vulab@iscas.ac.cn \
--to=vulab@iscas.ac.cn \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=visitorckw@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
all inboxes | Powered by JetHome®