linux-kernel - [PATCH] workqueue: unregister wq lockdep on error path in alloc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190308073713.39853-1-wangkefeng.wang@huawei.com>
Date:   Fri, 8 Mar 2019 15:37:13 +0800
From:   Kefeng Wang <wangkefeng.wang@...wei.com>
To:     Bart Van Assche <bvanassche@....org>,
        Ingo Molnar <mingo@...nel.org>, Tejun Heo <tj@...nel.org>,
        <linux-kernel@...r.kernel.org>
CC:     Kefeng Wang <wangkefeng.wang@...wei.com>,
        <syzbot+17335689e239ce135d8b@...kaller.appspotmail.com>
Subject: [PATCH] workqueue: unregister wq lockdep on error path in alloc_workqueue()

syzkaller report an issue "KASAN: use-after-free Read in alloc_workqueue",

alloc_workqueue
 - kzalloc wq
 - wq_init_lockdep(wq);
   - lockdep_register_key(&wq->key);  // add to hlist
 - kfree wq

But forget to call wq_unregister_lockdep()->lockdep_unregister_key(), it
will delete the entry from hlist.

Reported-by: syzbot+17335689e239ce135d8b@...kaller.appspotmail.com
Fixes: 669de8bda87b ("kernel/workqueue: Use dynamic lockdep keys for workqueues")
Signed-off-by: Kefeng Wang <wangkefeng.wang@...wei.com>
---
 kernel/workqueue.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 7abbeed13421..9209d25dfade 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4291,6 +4291,7 @@ struct workqueue_struct *alloc_workqueue(const char *fmt,
 	return wq;
 
 err_free_wq:
+	wq_unregister_lockdep(wq);
 	free_workqueue_attrs(wq->unbound_attrs);
 	kfree(wq);
 	return NULL;
-- 
2.20.1