History

Merge tag 'hardening-v7.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull hardening fixes from Kees Cook: - fix required Clang version for CC_HAS_COUNTED_BY_PTR (Nathan Chancellor) - update Coccinelle script used for kmalloc_obj * tag 'hardening-v7.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: init/Kconfig: Require a release version of clang-22 for CC_HAS_COUNTED_BY_PTR coccinelle: kmalloc_obj: Remove default GFP_KERNEL arg

Linus Torvalds committed 7 months ago

Commit d2a43e72 parents 51088b9 7a618ca2 files · +12 −1Browse files

Unified · Split

2 files
  1. init/Kconfig +1 −1
  2. scripts/coccinelle/api/kmalloc_objs.cocci +11 −0
init/Kconfig+1−1
@@ -146,7 +146,7 @@ config CC_HAS_COUNTED_BY · 145 unmodified lines
146config CC_HAS_COUNTED_BY_PTR146config CC_HAS_COUNTED_BY_PTR
147 bool147 bool
148 # supported since clang 22148 # supported since clang 22
149 default y if CC_IS_CLANG && CLANG_VERSION >= 220000149 default y if CC_IS_CLANG && CLANG_VERSION >= 220100
150 # supported since gcc 16.0.0150 # supported since gcc 16.0.0
151 default y if CC_IS_GCC && GCC_VERSION >= 160000151 default y if CC_IS_GCC && GCC_VERSION >= 160000
152 152
scripts/coccinelle/api/kmalloc_objs.cocci+11−0
@@ -122,3 +122,14 @@ fresh identifier ALLOC_OBJS = script:python(ALLOC_ARRAY) { alloc_array(ALLOC_ARR · 121 unmodified lines
122- ALLOC(struct_size_t(TYPE, FLEX, COUNT), GFP)122- ALLOC(struct_size_t(TYPE, FLEX, COUNT), GFP)
123+ ALLOC_FLEX(TYPE, FLEX, COUNT, GFP)123+ ALLOC_FLEX(TYPE, FLEX, COUNT, GFP)
124)124)
125
126@drop_gfp_kernel depends on patch && !(file in "tools") && !(file in "samples")@
127identifier ALLOC = {kmalloc_obj,kmalloc_objs,kmalloc_flex,
128 kzalloc_obj,kzalloc_objs,kzalloc_flex,
129 kvmalloc_obj,kvmalloc_objs,kvmalloc_flex,
130 kvzalloc_obj,kvzalloc_objs,kvzalloc_flex};
131@@
132
133 ALLOC(...
134- , GFP_KERNEL
135 )

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t