The patch titled
Subject: maple_tree: fix return from mas_prealloc()
has been added to the -mm mm-unstable branch. Its filename is
maple-tree-add-new-data-structure-fix-10.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/maple-tree-add-new-data-structure-fix-10.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Liam Howlett <liam.howlett@xxxxxxxxxx>
Subject: maple_tree: fix return from mas_prealloc()
Date: Fri, 17 Jun 2022 13:46:20 +0000
Record the error code before overwriting the node pointer and return the
error.
Link: https://lkml.kernel.org/r/20220617134609.1771611-1-Liam.Howlett@xxxxxxxxxx
Fixes: 2ef6c13ee71e (maple_tree: make mas_prealloc() error checking more generic)
Signed-off-by: Liam R. Howlett <Liam.Howlett@xxxxxxxxxx>
Cc: Qian Cai <quic_qiancai@xxxxxxxxxxx>
Cc: Yu Zhao <yuzhao@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/maple_tree.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/lib/maple_tree.c~maple-tree-add-new-data-structure-fix-10
+++ a/lib/maple_tree.c
@@ -5654,6 +5654,8 @@ void mas_store_prealloc(struct ma_state
*/
int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp)
{
+ int ret;
+
mas_set_alloc_req(mas, 1 + mas_mt_height(mas) * 3);
mas_alloc_nodes(mas, gfp);
if (likely(!mas_is_err(mas)))
@@ -5661,8 +5663,9 @@ int mas_preallocate(struct ma_state *mas
mas_set_alloc_req(mas, 0);
mas_destroy(mas);
+ ret = xa_err(mas->node);
mas->node = MAS_START;
- return xa_err(mas->node);
+ return ret;
}
/*
_
Patches currently in -mm which might be from liam.howlett@xxxxxxxxxx are
maple-tree-add-new-data-structure-fix.patch
maple-tree-add-new-data-structure-fix-2.patch
maple-tree-add-new-data-structure-fix-3.patch
maple-tree-add-new-data-structure-fix-4.patch
maple-tree-add-new-data-structure-fix-7.patch
maple-tree-add-new-data-structure-fix-8.patch
maple-tree-add-new-data-structure-fix-8-fix.patch
maple-tree-add-new-data-structure-fix-9.patch
maple-tree-add-new-data-structure-fix-10.patch
lib-test_maple_tree-add-testing-for-maple-tree-fix.patch
lib-test_maple_tree-add-testing-for-maple-tree-fix-2.patch
mm-start-tracking-vmas-with-maple-tree-fix-2.patch
mm-start-tracking-vmas-with-maple-tree-fix-3.patch
mm-mmap-use-advanced-maple-tree-api-for-mmap_region-fix-2.patch
mm-mmap-use-advanced-maple-tree-api-for-mmap_region-fix-3.patch
mm-mmap-change-do_brk_munmap-to-use-do_mas_align_munmap-fix.patch
mm-remove-the-vma-linked-list-fix.patch
mm-remove-the-vma-linked-list-fix-4.patch
mm-mlock-drop-dead-code-in-count_mm_mlocked_page_nr.patch
