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

Linus Torvalds committed 2 years ago

Commit 994d5c52 parents 47669f4 d71f2233 files · +5 −8Browse files

Showing the changes to include/uapi/linux (1 of 3 files). Show all

Unified · Split

include/uapi/linux/stddef.h+1−1

@@ -27,7 +27,7 @@ · 26 unmodified lines
27	union { \	27	union { \
28	struct { MEMBERS } ATTRS; \	28	struct { MEMBERS } ATTRS; \
29	struct TAG { MEMBERS } ATTRS NAME; \	29	struct TAG { MEMBERS } ATTRS NAME; \
30	}	30	} ATTRS
31		31
32	#ifdef __cplusplus	32	#ifdef __cplusplus
33	/* sizeof(struct{}) is 1 in C++, not 0, can't use C version of the macro. */	33	/* sizeof(struct{}) is 1 in C++, not 0, can't use C version of the macro. */