Skip to contentSkip to conversation

mm-prevent-derefencing-null-ptr-in-pfn_section_valid.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Jul 4, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: prevent derefencing NULL ptr in pfn_section_valid()
has been removed from the -mm tree. Its filename was
mm-prevent-derefencing-null-ptr-in-pfn_section_valid.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Waiman Long <[email protected]>
Subject: mm: prevent derefencing NULL ptr in pfn_section_valid()
Date: Tue, 25 Jun 2024 20:16:39 -0400

Commit 5ec8e8ea8b77 ("mm/sparsemem: fix race in accessing memory_section->usage") changed pfn_section_valid() to add a READ_ONCE() call around "ms->usage" to fix a race with section_deactivate() where ms->usage can be cleared. The READ_ONCE() call, by itself, is not enough to prevent NULL pointer dereference. We need to check its value before dereferencing it.

Fixes 5ec8e8ea8b77 ("mm/sparsemem: fix race in accessing memory_section->usage")
Cc Charan Teja Kalla <[email protected]>

---

 include/linux/mmzone.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/mmzone.h renamed from include/linux/mmzone.h~mm-prevent-derefencing-null-ptr-in-pfn_section_valid +2 -1
@@ -1979,8 +1979,9 @@ static inline int subsection_map_index(u
 static inline int pfn_section_valid(struct mem_section *ms, unsigned long pfn)
 {
 	int idx = subsection_map_index(pfn);
+	struct mem_section_usage *usage = READ_ONCE(ms->usage);
 
-	return test_bit(idx, READ_ONCE(ms->usage)->subsection_map);
+	return usage ? test_bit(idx, usage->subsection_map) : 0;
 }
 #else
 static inline int pfn_section_valid(struct mem_section *ms, unsigned long pfn)

_

Patches currently in -mm which might be from [email protected] are