Skip to content

Commit 8bab870

Browse files
botta633Wen Zhiwei
authored andcommitted
locking/lockdep: Avoid creating new name string literals in lockdep_set_subclass()
stable inclusion from stable-v6.6.64 commit 85cfe884668d7d81cae2f852cedd64c6d080118b category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IBL4B6 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=85cfe884668d7d81cae2f852cedd64c6d080118b -------------------------------- commit d7fe143cb115076fed0126ad8cf5ba6c3e575e43 upstream. Syzbot reports a problem that a warning will be triggered while searching a lock class in look_up_lock_class(). The cause of the issue is that a new name is created and used by lockdep_set_subclass() instead of using the existing one. This results in a lock instance has a different name pointer than previous registered one stored in lock class, and WARN_ONCE() is triggered because of that in look_up_lock_class(). To fix this, change lockdep_set_subclass() to use the existing name instead of a new one. Hence, no new name will be created by lockdep_set_subclass(). Hence, the warning is avoided. [boqun: Reword the commit log to state the correct issue] Reported-by: <[email protected]> Fixes: de8f5e4 ("lockdep: Introduce wait-type checks") Cc: [email protected] Signed-off-by: Ahmed Ehab <[email protected]> Signed-off-by: Boqun Feng <[email protected]> Link: https://lore.kernel.org/lkml/[email protected]/ Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Wen Zhiwei <[email protected]>
1 parent f08ee39 commit 8bab870

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/linux/lockdep.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ static inline void lockdep_init_map(struct lockdep_map *lock, const char *name,
230230
(lock)->dep_map.lock_type)
231231

232232
#define lockdep_set_subclass(lock, sub) \
233-
lockdep_init_map_type(&(lock)->dep_map, #lock, (lock)->dep_map.key, sub,\
233+
lockdep_init_map_type(&(lock)->dep_map, (lock)->dep_map.name, (lock)->dep_map.key, sub,\
234234
(lock)->dep_map.wait_type_inner, \
235235
(lock)->dep_map.wait_type_outer, \
236236
(lock)->dep_map.lock_type)

0 commit comments

Comments
 (0)