]> www.infradead.org Git - nvme.git/commitdiff
mm: prevent derefencing NULL ptr in pfn_section_valid()
authorWaiman Long <longman@redhat.com>
Wed, 26 Jun 2024 00:16:39 +0000 (20:16 -0400)
committerAndrew Morton <akpm@linux-foundation.org>
Thu, 4 Jul 2024 05:40:36 +0000 (22:40 -0700)
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.

Link: https://lkml.kernel.org/r/20240626001639.1350646-1-longman@redhat.com
Fixes: 5ec8e8ea8b77 ("mm/sparsemem: fix race in accessing memory_section->usage")
Signed-off-by: Waiman Long <longman@redhat.com>
Cc: Charan Teja Kalla <quic_charante@quicinc.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
include/linux/mmzone.h

index 586a8f0104d73a59051ced1b975abbc9dc4d1238..1dc6248feb83246d39e85425ba49725b7ca9269e 100644 (file)
@@ -1979,8 +1979,9 @@ static inline int subsection_map_index(unsigned long pfn)
 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)