mm/mprotect: Fix do_mprotect_pkey() return on error
Subsystems (4)
PATCH 1/1 mm/mprotect: Fix do_mprotect_pkey() return on error
When the loop over the VMA is terminated early due to an error, the return code could be overwritten with ENOMEM. Fix the return code by only setting the error on early loop termination when the error is not set.
--- mm/mprotect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/mprotect.c +1 -1
@@ -838,7 +838,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len, }tlb_finish_mmu (&tlb); -if (vma_iter_end (&vmi) < end) +if (!error &&vma_iter_end (&vmi) < end) error = -ENOMEM ; out:
Signature · 1 line
2.39.2
Andrew Morton
maintainerQuoted 7 lines · On Thu, 6 Apr 2023 15:30:50 -0400 "Liam R. Howlett" <[email protected]>…
When the loop over the VMA is terminated early due to an error, the return code could be overwritten with ENOMEM. Fix the return code by only setting the error on early loop termination when the error is not set.
Fixes 2286a6914c77 ("mm: change mprotect_fixup to vma iterator")Cc <[email protected]>
I do think we should always describe the user-visible effects when proposing a backport.
a) so the -stable maintainers understand why we're recommending the backport and
b) to help some poor soul who is looking at the patch wondering if it will fix his customer's bug report.
How's this?
: User-visible effects include: attempts to run mprotect() against a special : mapping or with a poorly-aligned hugetlb address should return -EINVAL, : but they presently return -ENOMEM.
Quoted 10 lines · Andrew Morton
Quoted 7 lines · On Thu, 6 Apr 2023 15:30:50 -0400 "Liam R. Howlett" <[email protected]>…
When the loop over the VMA is terminated early due to an error, the return code could be overwritten with ENOMEM. Fix the return code by only setting the error on early loop termination when the error is not set.
Fixes 2286a6914c77 ("mm: change mprotect_fixup to vma iterator")Cc <[email protected]>
Quoted 8 lines
I do think we should always describe the user-visible effects when proposing a backport.
a) so the -stable maintainers understand why we're recommending the backport and
b) to help some poor soul who is looking at the patch wondering if it will fix his customer's bug report.
Thanks, I'll keep this in mind.
Quoted 6 lines
How's this?
: User-visible effects include: attempts to run
mprotect()against a special : mapping or with a poorly-aligned hugetlb address should return-EINVAL, : but they presently return-ENOMEM.
That sounds reasonable, although this isn't an exhaustive list. It could be an -EACCESS for multiple reasons, or anything the vm_ops returns.