diff options
| author | Linus Torvalds <[email protected]> | 2023-12-01 14:17:54 +0900 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2023-12-01 14:17:54 +0900 |
| commit | 994d5c58e50e91bb02c7be4a91d5186292a895c8 (patch) | |
| tree | 27270745305fa6fd0e911faac5df05ad097a9e24 | |
| parent | 47669f40b14c32c9771e0852f7cd3a12eb044c2f (diff) | |
| parent | d71f22365a9caca82d424f3a33445de46567e198 (diff) | |
Merge tag 'hardening-v6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull hardening fixes from Kees Cook:
- struct_group: propagate attributes to top-level union (Dmitry
Antipov)
- gcc-plugins: randstruct: Update code comment in relayout_struct
(Gustavo A. R. Silva)
- MAINTAINERS: refresh LLVM support (Nick Desaulniers)
* tag 'hardening-v6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
gcc-plugins: randstruct: Update code comment in relayout_struct()
uapi: propagate __struct_group() attributes to the container union
MAINTAINERS: refresh LLVM support
| -rw-r--r-- | MAINTAINERS | 8 | ||||
| -rw-r--r-- | include/uapi/linux/stddef.h | 2 | ||||
| -rw-r--r-- | scripts/gcc-plugins/randomize_layout_plugin.c | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 012df8ccf34e..edae86acdfdc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5076,7 +5076,6 @@ CLANG CONTROL FLOW INTEGRITY SUPPORT M: Sami Tolvanen <[email protected]> M: Kees Cook <[email protected]> R: Nathan Chancellor <[email protected]> -R: Nick Desaulniers <[email protected]> S: Supported B: https://github.com/ClangBuiltLinux/linux/issues @@ -5091,8 +5090,9 @@ F: .clang-format CLANG/LLVM BUILD SUPPORT M: Nathan Chancellor <[email protected]> -M: Nick Desaulniers <[email protected]> -R: Tom Rix <[email protected]> +R: Nick Desaulniers <[email protected]> +R: Bill Wendling <[email protected]> +R: Justin Stitt <[email protected]> S: Supported W: https://clangbuiltlinux.github.io/ @@ -5242,7 +5242,6 @@ F: drivers/platform/x86/compal-laptop.c COMPILER ATTRIBUTES M: Miguel Ojeda <[email protected]> -R: Nick Desaulniers <[email protected]> S: Maintained F: include/linux/compiler_attributes.h @@ -11516,7 +11515,6 @@ F: fs/autofs/ KERNEL BUILD + files below scripts/ (unless maintained elsewhere) M: Masahiro Yamada <[email protected]> R: Nathan Chancellor <[email protected]> -R: Nick Desaulniers <[email protected]> R: Nicolas Schier <[email protected]> S: Maintained diff --git a/include/uapi/linux/stddef.h b/include/uapi/linux/stddef.h index 5c6c4269f7ef..2ec6f35cda32 100644 --- a/include/uapi/linux/stddef.h +++ b/include/uapi/linux/stddef.h @@ -27,7 +27,7 @@ union { \ struct { MEMBERS } ATTRS; \ struct TAG { MEMBERS } ATTRS NAME; \ - } + } ATTRS #ifdef __cplusplus /* sizeof(struct{}) is 1 in C++, not 0, can't use C version of the macro. */ diff --git a/scripts/gcc-plugins/randomize_layout_plugin.c b/scripts/gcc-plugins/randomize_layout_plugin.c index 910bd21d08f4..746ff2d272f2 100644 --- a/scripts/gcc-plugins/randomize_layout_plugin.c +++ b/scripts/gcc-plugins/randomize_layout_plugin.c @@ -339,8 +339,7 @@ static int relayout_struct(tree type) /* * enforce that we don't randomize the layout of the last - * element of a struct if it's a 0 or 1-length array - * or a proper flexible array + * element of a struct if it's a proper flexible array */ if (is_flexible_array(newtree[num_fields - 1])) { has_flexarray = true; |