workqueue: Only unregister a registered lockdep key
authorBart Van Assche <bvanassche@acm.org>
Mon, 11 Mar 2019 23:02:55 +0000 (16:02 -0700)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 21 Mar 2019 11:00:18 +0000 (12:00 +0100)
commit82efcab3b9f3ef59e9713237c6e3c05c3a95c1ae
tree3bbd3c0bb9bd14f7274279c711c2d9940a9bd098
parent9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
workqueue: Only unregister a registered lockdep key

The recent change to prevent use after free and a memory leak introduced an
unconditional call to wq_unregister_lockdep() in the error handling
path. If the lockdep key had not been registered yet, then the lockdep core
emits a warning.

Only call wq_unregister_lockdep() if wq_register_lockdep() has been
called first.

Fixes: 009bb421b6ce ("workqueue, lockdep: Fix an alloc_workqueue() error path")
Reported-by: syzbot+be0c198232f86389c3dd@syzkaller.appspotmail.com
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: Qian Cai <cai@lca.pw>
Link: https://lkml.kernel.org/r/20190311230255.176081-1-bvanassche@acm.org
kernel/workqueue.c