Commit 994d5c58 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 47669f40 d71f2236

MAINTAINERS

+3 −5
Original line number Diff line number Diff line
@@ -5076,7 +5076,6 @@ CLANG CONTROL FLOW INTEGRITY SUPPORT 
M:	Sami Tolvanen <samitolvanen@google.com>

M:	Kees Cook <keescook@chromium.org>

R:	Nathan Chancellor <nathan@kernel.org>

R:	Nick Desaulniers <ndesaulniers@google.com>

L:	llvm@lists.linux.dev

S:	Supported

B:	https://github.com/ClangBuiltLinux/linux/issues
@@ -5091,8 +5090,9 @@ F: .clang-format 








CLANG/LLVM BUILD SUPPORT









M:	Nathan Chancellor <nathan@kernel.org>









M:	Nick Desaulniers <ndesaulniers@google.com>









R:	Tom Rix <trix@redhat.com>









R:	Nick Desaulniers <ndesaulniers@google.com>









R:	Bill Wendling <morbo@google.com>









R:	Justin Stitt <justinstitt@google.com>









L:	llvm@lists.linux.dev









S:	Supported









W:	https://clangbuiltlinux.github.io/








@@ -5242,7 +5242,6 @@ F:	drivers/platform/x86/compal-laptop.c















COMPILER ATTRIBUTES









M:	Miguel Ojeda <ojeda@kernel.org>









R:	Nick Desaulniers <ndesaulniers@google.com>









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 <masahiroy@kernel.org>









R:	Nathan Chancellor <nathan@kernel.org>









R:	Nick Desaulniers <ndesaulniers@google.com>









R:	Nicolas Schier <nicolas@fjasle.eu>









L:	linux-kbuild@vger.kernel.org









S:	Maintained
































include/uapi/linux/stddef.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -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. */
































scripts/gcc-plugins/randomize_layout_plugin.c



+1
−2






























Original line number
Diff line number
Diff line







@@ -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;