diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2023-06-24 01:58:19 +0200 |
---|---|---|
committer | Andrew Morton <akpm@linux-foundation.org> | 2023-06-24 01:58:19 +0200 |
commit | 63773d2b593d86440c3b96fd300ed80d00cd06ef (patch) | |
tree | ebc7b1e8f1c0ce535ef9c6120209d0e87d8d4b16 /mm/mprotect.c | |
parent | mm: page_alloc: make compound_page_dtors static (diff) | |
parent | mm/mglru: make memcg_lru->lock irq safe (diff) | |
download | linux-63773d2b593d86440c3b96fd300ed80d00cd06ef.tar.xz linux-63773d2b593d86440c3b96fd300ed80d00cd06ef.zip |
Merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes.
Diffstat (limited to 'mm/mprotect.c')
-rw-r--r-- | mm/mprotect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mprotect.c b/mm/mprotect.c index 327a6eb90afb..6f658d483704 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -824,7 +824,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len, } tlb_finish_mmu(&tlb); - if (!error && vma_iter_end(&vmi) < end) + if (!error && tmp < end) error = -ENOMEM; out: |