提交 27087618 编写于 作者: W Waiman Long 提交者: Xie XiuQi

locking/lockdep: Add debug_locks check in __lock_downgrade()

mainline inclusion
from mainline-5.1-rc1
commit 513e1073d52e55b8024b4f238a48de7587c64ccf
category: bugfix
bugzilla: 11592
CVE: NA

-------------------------------------------------
Tetsuo Handa had reported he saw an incorrect "downgrading a read lock"
warning right after a previous lockdep warning. It is likely that the
previous warning turned off lock debugging causing the lockdep to have
inconsistency states leading to the lock downgrade warning.

Fix that by add a check for debug_locks at the beginning of
__lock_downgrade().
Reported-by: NTetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Reported-by: syzbot+53383ae265fb161ef488@syzkaller.appspotmail.com
Signed-off-by: NWaiman Long <longman@redhat.com>
Signed-off-by: NPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Link: https://lkml.kernel.org/r/1547093005-26085-1-git-send-email-longman@redhat.comSigned-off-by: NIngo Molnar <mingo@kernel.org>
(cherry picked from commit 513e1073d52e55b8024b4f238a48de7587c64ccf)
Signed-off-by: NZhen Lei <thunder.leizhen@huawei.com>
Reviewed-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 32f52dec
...@@ -3567,6 +3567,9 @@ __lock_set_class(struct lockdep_map *lock, const char *name, ...@@ -3567,6 +3567,9 @@ __lock_set_class(struct lockdep_map *lock, const char *name,
unsigned int depth; unsigned int depth;
int i; int i;
if (unlikely(!debug_locks))
return 0;
depth = curr->lockdep_depth; depth = curr->lockdep_depth;
/* /*
* This function is about (re)setting the class of a held lock, * This function is about (re)setting the class of a held lock,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册