]> www.infradead.org Git - users/hch/configfs.git/commit
mm/mlock: set the correct prev on failure
authorWei Yang <richard.weiyang@gmail.com>
Sun, 27 Oct 2024 12:33:21 +0000 (12:33 +0000)
committerAndrew Morton <akpm@linux-foundation.org>
Thu, 7 Nov 2024 22:14:58 +0000 (14:14 -0800)
commitfaa242b1d2a97143150bdc50d5b61fd70fcd17cd
tree17b9cec9ab37f16dffd7e389e4ece081fa9202ee
parentcb6fcef8b4b6c655b6a25cc3a415cd9eb81b3da8
mm/mlock: set the correct prev on failure

After commit 94d7d9233951 ("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: 94d7d9233951 ("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>
mm/mlock.c