Messages in this thread Patch in this message | | | From | Tetsuo Handa <> | Subject | [PATCH] workqueue: Try to catch flush_work() without INIT_WORK(). | Date | Sat, 19 Jan 2019 02:04:58 +0900 |
| |
syzbot found a flush_work() caller who forgot to call INIT_WORK() because that work_struct was allocated by kzalloc(). But the message
INFO: trying to register non-static key. the code is fine but needs lockdep annotation. turning off the locking correctness validator.
by lock_map_acquire() is failing to tell that INIT_WORK() is missing.
Since flush_work() without INIT_WORK() is a bug, and INIT_WORK() should set ->func field to non-zero, let's warn if ->func field is zero.
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> --- kernel/workqueue.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 392be4b..a503ad9 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -2908,6 +2908,9 @@ static bool __flush_work(struct work_struct *work, bool from_cancel) if (WARN_ON(!wq_online)) return false; + if (WARN_ON(!work->func)) + return false; + if (!from_cancel) { lock_map_acquire(&work->lockdep_map); lock_map_release(&work->lockdep_map); -- 1.8.3.1
| |