With memory allocation profiling enabled after boot, a slab allocation can dereference a NULL pointer if current->alloc_tag is not set and allocating the slab object extensions fails: __alloc_tagging_slab_alloc_hook() passes current->alloc_tag to alloc_tag_set_inaccurate(), which does not handle a NULL tag currently. One way to trigger it is through rhashtable: rhashtable_init() records current->alloc_tag in ht->alloc_tag, which is NULL while profiling is disabled. Once profiling gets enabled, alloc_hooks_tag() sets current->alloc_tag to that NULL tag when allocating a bucket table. Fix it by handling NULL tags in alloc_tag_set_inaccurate(), just like alloc_tag_add() and alloc_tag_sub() already do, and drop the now unnecessary check in __pgalloc_tag_add(). This has low urgency. Fixes: b9e2f58ffb84 ("alloc_tag: mark inaccurate allocation counters in /proc/allocinfo output") Cc: stable@vger.kernel.org Reported-by: Chris Mason Signed-off-by: David Hildenbrand (Arm) --- include/linux/alloc_tag.h | 3 ++- mm/page_alloc.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/alloc_tag.h b/include/linux/alloc_tag.h index 7f2d80a597924..0f9909c6701a7 100644 --- a/include/linux/alloc_tag.h +++ b/include/linux/alloc_tag.h @@ -227,7 +227,8 @@ static inline void alloc_tag_sub(union codetag_ref *ref, size_t bytes) static inline void alloc_tag_set_inaccurate(struct alloc_tag *tag) { - tag->ct.flags |= CODETAG_FLAG_INACCURATE; + if (tag) + tag->ct.flags |= CODETAG_FLAG_INACCURATE; } static inline bool alloc_tag_is_inaccurate(struct alloc_tag *tag) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 2fef4092c913c..0b76923145456 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1262,8 +1262,7 @@ void __pgalloc_tag_add(struct page *page, struct task_struct *task, * clear the tag ref later when page_ext is initialized. */ alloc_tag_add_early_pfn(page_to_pfn(page), alloc_flags); - if (task->alloc_tag) - alloc_tag_set_inaccurate(task->alloc_tag); + alloc_tag_set_inaccurate(task->alloc_tag); } } -- 2.56.1