Commit 14c86e20 authored by Hajime Tazaki's avatar Hajime Tazaki Committed by Kaixiong Yu
Browse files

nommu: pass NULL argument to vma_iter_prealloc() 

stable inclusion
from stable-v6.6.63
commit 8bbf0ab631cdf1dade6745f137cff98751e6ced7
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB8IUS
CVE: CVE-2024-53109

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8bbf0ab631cdf1dade6745f137cff98751e6ced7

--------------------------------

commit 247d720b2c5d22f7281437fd6054a138256986ba upstream.

When deleting a vma entry from a maple tree, it has to pass NULL to
vma_iter_prealloc() in order to calculate internal state of the tree, but
it passed a wrong argument.  As a result, nommu kernels crashed upon
accessing a vma iterator, such as acct_collect() reading the size of vma
entries after do_munmap().

This commit fixes this issue by passing a right argument to the
preallocation call.

Link: https://lkml.kernel.org/r/20241108222834.3625217-1-thehajime@gmail.com


Fixes: b5df0922 ("mm: set up vma iterator for vma_iter_prealloc() calls")
Signed-off-by: default avatarHajime Tazaki <thehajime@gmail.com>
Reviewed-by: default avatarLiam R. Howlett <Liam.Howlett@Oracle.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarTong Tiangen <tongtiangen@huawei.com>
parent c82ce532

mm/nommu.c

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ static int delete_vma_from_mm(struct vm_area_struct *vma) 
	VMA_ITERATOR(vmi, vma->vm_mm, vma->vm_start);



	vma_iter_config(&vmi, vma->vm_start, vma->vm_end);

	if (vma_iter_prealloc(&vmi, vma)) {

	if (vma_iter_prealloc(&vmi, NULL)) {

		pr_warn("Allocation of vma tree for process %d failed\n",

		       current->pid);

		return -ENOMEM;