superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm/madvise: handle madvise_lock() failure during race unwinding 

When unwinding race on -ERESTARTNOINTR handling of process_madvise(),
madvise_lock() failure is ignored.  Check the failure and abort remaining
works in the case.

Link: https://lkml.kernel.org/r/20250602174926.1074-1-sj@kernel.org
Fixes: 4000e3d0a3 ("mm/madvise: remove redundant mmap_lock operations from process_madvise()")
Signed-off-by: SeongJae Park <sj@kernel.org>
Reported-by: Barry Song <21cnbao@gmail.com>
Closes: https://lore.kernel.org/CAGsJ_4xJXXO0G+4BizhohSZ4yDteziPw43_uF8nPXPWxUVChzw@mail.gmail.com
Reviewed-by: Jann Horn <jannh@google.com>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Acked-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Shakeel Butt <shakeel.butt@linux.dev>
Reviewed-by: Barry Song <baohua@kernel.org>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
pull/1260/head
SeongJae Park 2025-06-02 10:49:26 -07:00 committed by Andrew Morton
parent 684088173b
commit 9c49e5d09f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mm/madvise.c
View File

@ -1881,7 +1881,9 @@ static ssize_t vector_madvise(struct mm_struct *mm, struct iov_iter *iter,
/* Drop and reacquire lock to unwind race. */ /* Drop and reacquire lock to unwind race. */
madvise_finish_tlb(&madv_behavior); madvise_finish_tlb(&madv_behavior);
madvise_unlock(mm, behavior); madvise_unlock(mm, behavior);
madvise_lock(mm, behavior); ret = madvise_lock(mm, behavior);
if (ret)
goto out;
madvise_init_tlb(&madv_behavior, mm); madvise_init_tlb(&madv_behavior, mm);
continue; continue;
} }
@ -1892,6 +1894,7 @@ static ssize_t vector_madvise(struct mm_struct *mm, struct iov_iter *iter,
madvise_finish_tlb(&madv_behavior); madvise_finish_tlb(&madv_behavior);
madvise_unlock(mm, behavior); madvise_unlock(mm, behavior);
out:
ret = (total_len - iov_iter_count(iter)) ? : ret; ret = (total_len - iov_iter_count(iter)) ? : ret;
return ret; return ret;