]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
mm, hwpoison: fix possible use-after-free in mf_dax_kill_procs()
authorMiaohe Lin <linmiaohe@huawei.com>
Tue, 23 Aug 2022 03:23:44 +0000 (11:23 +0800)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 26 Aug 2022 05:03:06 +0000 (22:03 -0700)
After kill_procs(), tk will be freed without being removed from the
to_kill list.  In the next iteration, the freed list entry in the to_kill
list will be accessed, thus leading to use-after-free issue.  Adding
list_del() in kill_procs() to fix the issue.

Link: https://lkml.kernel.org/r/20220823032346.4260-5-linmiaohe@huawei.com
Fixes: c36e20249571 ("mm: introduce mf_dax_kill_procs() for fsdax case")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/memory-failure.c

index 7023c3d8127309a24d374913963c2842e3be67a2..e13fd04a84b7df1f0363c7553a2759a10b12df03 100644 (file)
@@ -413,7 +413,7 @@ static void kill_procs(struct list_head *to_kill, int forcekill, bool fail,
 {
        struct to_kill *tk, *next;
 
-       list_for_each_entry_safe (tk, next, to_kill, nd) {
+       list_for_each_entry_safe(tk, next, to_kill, nd) {
                if (forcekill) {
                        /*
                         * In case something went wrong with munmapping
@@ -437,6 +437,7 @@ static void kill_procs(struct list_head *to_kill, int forcekill, bool fail,
                                pr_err("%#lx: Cannot send advisory machine check signal to %s:%d\n",
                                       pfn, tk->tsk->comm, tk->tsk->pid);
                }
+               list_del(&tk->nd);
                put_task_struct(tk->tsk);
                kfree(tk);
        }