Skip to contentSkip to conversation

Patch "slab: remove __alloc_size attribute from __kmalloc_track_caller" has been added to the 5.16-stable tree

PATCH [email protected] 1 participant 1 message Feb 25, 2022

Subsystems (2)
lore
Share & tools
lore

[email protected]

author Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

slab: remove __alloc_size attribute from __kmalloc_track_caller

to the 5.16-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
slab-remove-__alloc_size-attribute-from-__kmalloc_track_caller.patch
and it can be found in the queue-5.16 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From 93dd04ab0b2b32ae6e70284afc764c577156658e Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <[email protected]>
Date: Fri, 18 Feb 2022 14:13:58 +0100
Subject: slab: remove __alloc_size attribute from __kmalloc_track_caller

From: Greg Kroah-Hartman <[email protected]>

commit 93dd04ab0b2b32ae6e70284afc764c577156658e upstream.

Commit c37495d6254c ("slab: add __alloc_size attributes for better bounds checking") added __alloc_size attributes to a bunch of kmalloc function prototypes. Unfortunately the change to __kmalloc_track_caller seems to cause clang to generate broken code and the first time this is called when booting, the box will crash.

While the compiler problems are being reworked and attempted to be solved [1], let's just drop the attribute to solve the issue now. Once it is resolved it can be added back.

[1] https://github.com/ClangBuiltLinux/linux/issues/1599

Fixes c37495d6254c ("slab: add __alloc_size attributes for better bounds checking")
Cc stable <[email protected]>
Cc Kees Cook <[email protected]>
Cc Daniel Micay <[email protected]>
Cc Nick Desaulniers <[email protected]>
Cc Christoph Lameter <[email protected]>
Cc Pekka Enberg <[email protected]>
Cc Joonsoo Kim <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Nathan Chancellor <[email protected]>
---
 include/linux/slab.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
include/linux/slab.h +1 -2
@@ -669,8 +669,7 @@ static inline __alloc_size(1, 2) void *k
  * allocator where we care about the real place the memory allocation
  * request comes from.
  */
-extern void *__kmalloc_track_caller(size_t size, gfp_t flags, unsigned long caller)
-				   __alloc_size(1);
+extern void *__kmalloc_track_caller(size_t size, gfp_t flags, unsigned long caller);
 #define kmalloc_track_caller(size, flags) \
 	__kmalloc_track_caller(size, flags, _RET_IP_)
 

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

queue-5.16/mm-filemap-fix-handling-of-thps-in-generic_file_buffered_read.patch queue-5.16/btrfs-tree-checker-check-item_size-for-inode_item.patch queue-5.16/cgroup-cpuset-fix-a-race-between-cpuset_attach-and-cpu-hotplug.patch queue-5.16/btrfs-tree-checker-check-item_size-for-dev_item.patch queue-5.16/slab-remove-__alloc_size-attribute-from-__kmalloc_track_caller.patch queue-5.16/cgroup-v1-correct-privileges-check-in-release_agent-writes.patch