History

Merge tag 'hardening-v6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull hardening updates from Kees Cook: "As usual, it's scattered changes all over. Patches touching things outside of our traditional areas in the tree have been Acked by maintainers or were trivial changes: - loadpin: remove unsupported MODULE_COMPRESS_NONE (Arulpandiyan Vadivel) - samples/check-exec: Fix script name (Mickaël Salaün) - yama: remove needless locking in yama_task_prctl() (Oleg Nesterov) - lib/string_choices: Sort by function name (R Sundar) - hardening: Allow default HARDENED_USERCOPY to be set at compile time (Mel Gorman) - uaccess: Split out compile-time checks into ucopysize.h - kbuild: clang: Support building UM with SUBARCH=i386 - x86: Enable i386 FORTIFY_SOURCE on Clang 16+ - ubsan/overflow: Rework integer overflow sanitizer option - Add missing __nonstring annotations for callers of memtostr*()/strtomem*() - Add __must_be_noncstr() and have memtostr*()/strtomem*() check for it - Introduce __nonstring_array for silencing future GCC 15 warnings" * tag 'hardening-v6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: (26 commits) compiler_types: Introduce __nonstring_array hardening: Enable i386 FORTIFY_SOURCE on Clang 16+ x86/build: Remove -ffreestanding on i386 with GCC ubsan/overflow: Enable ignorelist parsing and add type filter ubsan/overflow: Enable pattern exclusions ubsan/overflow: Rework integer overflow sanitizer option to turn on everything samples/check-exec: Fix script name yama: don't abuse rcu_read_lock/get_task_struct in yama_task_prctl() kbuild: clang: Support building UM with SUBARCH=i386 loadpin: remove MODULE_COMPRESS_NONE as it is no longer supported lib/string_choices: Rearrange functions in sorted order string.h: Validate memtostr*()/strtomem*() arguments more carefully compiler.h: Introduce __must_be_noncstr() nilfs2: Mark on-disk strings as nonstring uapi: stddef.h: Introduce __kernel_nonstring x86/tdx: Mark message.bytes as nonstring string: kunit: Mark nonstring test strings as __nonstring scsi: qla2xxx: Mark device strings as nonstring scsi: mpt3sas: Mark device strings as nonstring scsi: mpi3mr: Mark device strings as nonstring ...

Linus Torvalds committed 1 year ago

Commit fc13a782 parents 06961fb b688f3636 files · +285 −153Browse files

Showing the changes to include/uapi (2 of 36 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/nilfs2_ondisk.h +2 −1
  2. include/uapi/linux/stddef.h +6 −0
include/uapi/linux/nilfs2_ondisk.h+2−1
@@ -188,7 +188,8 @@ struct nilfs_super_block { · 187 unmodified lines
188 __le16 s_segment_usage_size; /* Size of a segment usage */188 __le16 s_segment_usage_size; /* Size of a segment usage */
189 189
190/*98*/ __u8 s_uuid[16]; /* 128-bit uuid for volume */190/*98*/ __u8 s_uuid[16]; /* 128-bit uuid for volume */
191/*A8*/ char s_volume_name[80]; /* volume name */191/*A8*/ char s_volume_name[80] /* volume name */
192 __kernel_nonstring;
192 193
193/*F8*/ __le32 s_c_interval; /* Commit interval of segment */194/*F8*/ __le32 s_c_interval; /* Commit interval of segment */
194 __le32 s_c_block_max; /*195 __le32 s_c_block_max; /*
include/uapi/linux/stddef.h+6−0
@@ -70,4 +70,10 @@ · 69 unmodified lines
70#define __counted_by_be(m)70#define __counted_by_be(m)
71#endif71#endif
72 72
73#ifdef __KERNEL__
74#define __kernel_nonstring __nonstring
75#else
76#define __kernel_nonstring
77#endif
78
73#endif /* _UAPI_LINUX_STDDEF_H */79#endif /* _UAPI_LINUX_STDDEF_H */