diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-12-01 14:17:54 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-12-01 14:17:54 +0900 |
| commit | 994d5c58e50e91bb02c7be4a91d5186292a895c8 (patch) | |
| tree | 27270745305fa6fd0e911faac5df05ad097a9e24 /scripts | |
| 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
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/gcc-plugins/randomize_layout_plugin.c | 3 |
1 files changed, 1 insertions, 2 deletions
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; |