Commit 82f95134 authored by Liam R. Howlett's avatar Liam R. Howlett Committed by Andrew Morton

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.

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.  In other cases an -EACCESS
should be returned.

Link: https://lkml.kernel.org/r/20230406193050.1363476-1-Liam.Howlett@oracle.com
Fixes: 2286a691 ("mm: change mprotect_fixup to vma iterator")
Signed-off-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent dd47ac42
...@@ -838,7 +838,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len, ...@@ -838,7 +838,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len,
} }
tlb_finish_mmu(&tlb); tlb_finish_mmu(&tlb);
if (vma_iter_end(&vmi) < end) if (!error && vma_iter_end(&vmi) < end)
error = -ENOMEM; error = -ENOMEM;
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment