From: Waiman Long <longman@redhat.com>
To: Xiang Gao <gxxa03070307@gmail.com>,
peterz@infradead.org, mingo@redhat.com, will@kernel.org,
boqun@kernel.org
Cc: linux-kernel@vger.kernel.org, Xiang Gao <gaoxiang17@xiaomi.com>
Subject: Re: [PATCH] lockdep: fix NULL pointer dereference in __lock_set_class()
Date: Thu, 16 Apr 2026 11:04:59 -0400 [thread overview]
Message-ID: <96c3f46d-0d32-463c-9ebb-f6e740e3ce5a@redhat.com> (raw)
In-Reply-To: <20260416085443.927247-1-gxxa03070307@gmail.com>
On 4/16/26 4:54 AM, Xiang Gao wrote:
> From: Xiang Gao <gaoxiang17@xiaomi.com>
>
> register_lock_class() can return NULL on failure (e.g., exceeding
> MAX_LOCKDEP_KEYS or lock_keys_in_use overflow). __lock_set_class()
> uses the return value directly in pointer arithmetic without a NULL
> check:
>
> class = register_lock_class(lock, subclass, 0);
> hlock->class_idx = class - lock_classes;
>
> If class is NULL, this computes a garbage negative offset that corrupts
> hlock->class_idx (a bitfield). Any subsequent hlock_class() call on
> this hlock returns a garbage pointer, leading to memory corruption or
> a crash.
>
> The other call site in __lock_acquire() (line 5112) already handles
> this correctly with an explicit NULL check. Add the same guard here.
>
> Signed-off-by: Xiang Gao <gaoxiang17@xiaomi.com>
> ---
> kernel/locking/lockdep.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
> index 2d4c5bab5af8..e0de81114824 100644
> --- a/kernel/locking/lockdep.c
> +++ b/kernel/locking/lockdep.c
> @@ -5437,6 +5437,8 @@ __lock_set_class(struct lockdep_map *lock, const char *name,
> lock->wait_type_outer,
> lock->lock_type);
> class = register_lock_class(lock, subclass, 0);
> + if (!class)
> + return 0;
> hlock->class_idx = class - lock_classes;
>
> curr->lockdep_depth = i;
LKTM, maybe you can add "Fixes: 64aa348edc61 ("lockdep:
lock_set_subclass - reset a held lock's subclass")"
Reviewed-by: Waiman Long <longman@redhat.com>
next prev parent reply other threads:[~2026-04-16 15:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-16 8:54 Xiang Gao
2026-04-16 15:04 ` Waiman Long [this message]
2026-04-16 15:20 ` Dmitry Ilvokhin
2026-04-18 14:14 Xiang Gao
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=96c3f46d-0d32-463c-9ebb-f6e740e3ce5a@redhat.com \
--to=longman@redhat.com \
--cc=boqun@kernel.org \
--cc=gaoxiang17@xiaomi.com \
--cc=gxxa03070307@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=will@kernel.org \
/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®