Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 09:12:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm/mlock: set the correct prev on failure

Browse Source 
After commit 94d7d92339 ("mm: abstract the vma_merge()/split_vma()
pattern for mprotect() et al."), if vma_modify_flags() return error, the
vma is set to an error code.  This will lead to an invalid prev be
returned.

Generally this shouldn't matter as the caller should treat an error as
indicating state is now invalidated, however unfortunately
apply_mlockall_flags() does not check for errors and assumes that
mlock_fixup() correctly maintains prev even if an error were to occur.

This patch fixes that assumption.

[lorenzo.stoakes@oracle.com: provide a better fix and rephrase the log]
Link: https://lkml.kernel.org/r/20241027123321.19511-1-richard.weiyang@gmail.com
Fixes: 94d7d92339 ("mm: abstract the vma_merge()/split_vma() pattern for mprotect() et al.")
Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Jann Horn <jannh@google.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Wei Yang 2024-10-27 12:33:21 +00:00 committed by Andrew Morton
parent cb6fcef8b4
commit faa242b1d2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mm/mlock.c
View File

@ -725,14 +725,17 @@ static int apply_mlockall_flags(int flags)
} }
for_each_vma(vmi, vma) { for_each_vma(vmi, vma) {
int error;
vm_flags_t newflags; vm_flags_t newflags;
newflags = vma->vm_flags & ~VM_LOCKED_MASK; newflags = vma->vm_flags & ~VM_LOCKED_MASK;
newflags |= to_add; newflags |= to_add;
/* Ignore errors */ error = mlock_fixup(&vmi, vma, &prev, vma->vm_start, vma->vm_end,
mlock_fixup(&vmi, vma, &prev, vma->vm_start, vma->vm_end,
newflags); newflags);
/* Ignore errors, but prev needs fixing up. */
if (error)
prev = vma;
cond_resched(); cond_resched();
} }
out: out: