linux-kernel - [PATCH] maple_tree: Fix return from mas

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20220617134609.1771611-1-Liam.Howlett@oracle.com>
Date:   Fri, 17 Jun 2022 13:46:20 +0000
From:   Liam Howlett <liam.howlett@...cle.com>
To:     "maple-tree@...ts.infradead.org" <maple-tree@...ts.infradead.org>,
        "linux-mm@...ck.org" <linux-mm@...ck.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Qian Cai <quic_qiancai@...cinc.com>
CC:     Yu Zhao <yuzhao@...gle.com>
Subject: [PATCH] maple_tree: Fix return from mas_prealloc()

Record the error code before overwriting the node pointer and return the
error.

Fixes: 2ef6c13ee71e (maple_tree: make mas_prealloc() error checking more generic)
Signed-off-by: Liam R. Howlett <Liam.Howlett@...cle.com>
---
 lib/maple_tree.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 89ff5ef7ee28..1f4c476aa5e7 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5670,6 +5670,8 @@ void mas_store_prealloc(struct ma_state *mas, void *entry)
  */
 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)))
@@ -5677,8 +5679,9 @@ int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp)
 
 	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;
 }
 
 /*
-- 
2.35.1