mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Liam R. Howlett (Oracle)" <liam@infradead.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	maple-tree@lists.infradead.org,
	"Liam R. Howlett (Oracle)" <liam@infradead.org>
Subject: [PATCH fixup] maple_tree: Fix dereference of rcu type
Date: Mon, 29 Jun 2026 11:22:35 -0400	[thread overview]
Message-ID: <20260629152235.1629785-1-liam@infradead.org> (raw)
In-Reply-To: <20260629144145.1572283-12-liam@infradead.org>

When getting the slot, the rcu type of the slot needs to use
rcu_dereference_protected() to ensure no locking issues.

Signed-off-by: Liam R. Howlett (Oracle) <liam@infradead.org>
---
 lib/maple_tree.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Andrew,

Please apply this fix to "[PATCH 11/18] maple_tree: Add bulk parent set
helper" to avoid type complaints.

Thanks,
Liam

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index eb7f32081b65d..f1b9c9b32bd42 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -525,8 +525,10 @@ void mas_set_parent_slots(struct ma_state *mas, struct maple_enode *parent,
 
 	for (i = 0; i < count; i++) {
 		unsigned long pval = val | ((start_slot + i) << shift) | type;
-		struct maple_enode *child = (struct maple_enode *)slots[i];
+		struct maple_enode *child;
 
+		child = ma_enode_ptr(rcu_dereference_protected(slots[i],
+						       mt_locked(mas->tree)));
 		mte_to_node(child)->parent = ma_parent_ptr(pval);
 	}
 }
-- 
2.47.3


  reply	other threads:[~2026-06-29 15:22 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-29 14:41 [PATCH 00/18] maple_tree: lock checking and clean ups Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 01/18] maple_tree: Add rcu locking check when LOCKDEP is enabled Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 02/18] locking/lockdep: Add sequence counter to held_lock Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 03/18] maple_tree: Add write lock checking with lockdep sequence numbers Liam R. Howlett (Oracle)
2026-06-29 15:03   ` [PATCH fixup] maple_tree: Static define mas_lockdep_map() Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 04/18] maple_tree: Documentation fix Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 05/18] maple_tree: Drop dead code from mas_extend_spanning_null() Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 06/18] maple_tree: Drop MAPLE_ALLOC_SLOTS Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 07/18] maple_tree: Clarify comments on mas_nomem() Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 08/18] maple_tree: Use prefetched value in mas_wr_store_type() Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 09/18] maple_tree: Optimise mas_wr_node_store() when not in rcu mode Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 10/18] maple_tree: micro optimisation of mas_wr_store_type() Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 11/18] maple_tree: Add bulk parent set helper Liam R. Howlett (Oracle)
2026-06-29 15:22   ` Liam R. Howlett (Oracle) [this message]
2026-06-29 14:41 ` [PATCH 12/18] maple_tree: Catch race in mas_alloc_cyclic() Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 13/18] maple_tree: Document that erase may use GFP_KERNEL for allocations Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 14/18] maple_tree: WARN_ON_ONCE when allocations fail Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 15/18] maple_tree: Document erase and allocations better Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 16/18] maple_tree: Change two GFP flags in tests Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 17/18] maple_tree: Fix argument name in header Liam R. Howlett (Oracle)
2026-06-29 14:41 ` [PATCH 18/18] maple_tree: Avoid extra gap calculation Liam R. Howlett (Oracle)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260629152235.1629785-1-liam@infradead.org \
    --to=liam@infradead.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=maple-tree@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®