# git rev-parse -q --verify 87caef42200cd44f8b808ec2f8ac2257f3e0a8c1^{commit} 87caef42200cd44f8b808ec2f8ac2257f3e0a8c1 already have revision, skipping fetch # git checkout -q -f -B kisskb 87caef42200cd44f8b808ec2f8ac2257f3e0a8c1 # git clean -qxdf # < git log -1 # commit 87caef42200cd44f8b808ec2f8ac2257f3e0a8c1 # Merge: 92f74f7f4083 6d305cbef1aa # Author: Linus Torvalds # Date: Mon May 13 14:14:05 2024 -0700 # # Merge tag 'hardening-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux # # Pull hardening updates from Kees Cook: # "The bulk of the changes here are related to refactoring and expanding # the KUnit tests for string helper and fortify behavior. # # Some trivial strncpy replacements in fs/ were carried in my tree. Also # some fixes to SCSI string handling were carried in my tree since the # helper for those was introduce here. Beyond that, just little fixes # all around: objtool getting confused about LKDTM+KCFI, preparing for # future refactors (constification of sysctl tables, additional # __counted_by annotations), a Clang UBSAN+i386 crash fix, and adding # more options in the hardening.config Kconfig fragment. # # Summary: # # - selftests: Add str*cmp tests (Ivan Orlov) # # - __counted_by: provide UAPI for _le/_be variants (Erick Archer) # # - Various strncpy deprecation refactors (Justin Stitt) # # - stackleak: Use a copy of soon-to-be-const sysctl table (Thomas # Weißschuh) # # - UBSAN: Work around i386 -regparm=3 bug with Clang prior to # version 19 # # - Provide helper to deal with non-NUL-terminated string copying # # - SCSI: Fix older string copying bugs (with new helper) # # - selftests: Consolidate string helper behavioral tests # # - selftests: add memcpy() fortify tests # # - string: Add additional __realloc_size() annotations for "dup" # helpers # # - LKDTM: Fix KCFI+rodata+objtool confusion # # - hardening.config: Enable KCFI" # # * tag 'hardening-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: (29 commits) # uapi: stddef.h: Provide UAPI macros for __counted_by_{le, be} # stackleak: Use a copy of the ctl_table argument # string: Add additional __realloc_size() annotations for "dup" helpers # kunit/fortify: Fix replaced failure path to unbreak __alloc_size # hardening: Enable KCFI and some other options # lkdtm: Disable CFI checking for perms functions # kunit/fortify: Add memcpy() tests # kunit/fortify: Do not spam logs with fortify WARNs # kunit/fortify: Rename tests to use recommended conventions # init: replace deprecated strncpy with strscpy_pad # kunit/fortify: Fix mismatched kvalloc()/vfree() usage # scsi: qla2xxx: Avoid possible run-time warning with long model_num # scsi: mpi3mr: Avoid possible run-time warning with long manufacturer strings # scsi: mptfusion: Avoid possible run-time warning with long manufacturer strings # fs: ecryptfs: replace deprecated strncpy with strscpy # hfsplus: refactor copy_name to not use strncpy # reiserfs: replace deprecated strncpy with scnprintf # virt: acrn: replace deprecated strncpy with strscpy # ubsan: Avoid i386 UBSAN handler crashes with Clang # ubsan: Remove 1-element array usage in debug reporting # ... # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 87caef42200cd44f8b808ec2f8ac2257f3e0a8c1 # make -s -j 24 ARCH=sh O=/kisskb/build/linus_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- defconfig # < make -s -j 24 ARCH=sh O=/kisskb/build/linus_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 24 ARCH=sh O=/kisskb/build/linus_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 24 ARCH=sh O=/kisskb/build/linus_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/cpu/sh4/fpu.c:389:6: warning: no previous prototype for 'float_raise' [-Wmissing-prototypes] 389 | void float_raise(unsigned int flags) | ^~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh4/fpu.c:394:5: warning: no previous prototype for 'float_rounding_mode' [-Wmissing-prototypes] 394 | int float_rounding_mode(void) | ^~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/cache-shx3.c:18:13: warning: no previous prototype for 'shx3_cache_init' [-Wmissing-prototypes] 18 | void __init shx3_cache_init(void) | ^~~~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/cache-sh4.c:384:13: warning: no previous prototype for 'sh4_cache_init' [-Wmissing-prototypes] 384 | void __init sh4_cache_init(void) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/flush-sh4.c:106:13: warning: no previous prototype for 'sh4__flush_region_init' [-Wmissing-prototypes] 106 | void __init sh4__flush_region_init(void) | ^~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/init.c:99:29: warning: no previous prototype for 'l2_cache_init' [-Wmissing-prototypes] 99 | void __attribute__ ((weak)) l2_cache_init(void) | ^~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/pgtable.c:10:6: warning: no previous prototype for 'pgd_ctor' [-Wmissing-prototypes] 10 | void pgd_ctor(void *x) | ^~~~~~~~ /kisskb/src/arch/sh/mm/pgtable.c:32:8: warning: no previous prototype for 'pgd_alloc' [-Wmissing-prototypes] 32 | pgd_t *pgd_alloc(struct mm_struct *mm) | ^~~~~~~~~ /kisskb/src/arch/sh/mm/pgtable.c:37:6: warning: no previous prototype for 'pgd_free' [-Wmissing-prototypes] 37 | void pgd_free(struct mm_struct *mm, pgd_t *pgd) | ^~~~~~~~ /kisskb/src/arch/sh/mm/pgtable.c:43:6: warning: no previous prototype for 'pud_populate' [-Wmissing-prototypes] 43 | void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd) | ^~~~~~~~~~~~ /kisskb/src/arch/sh/mm/pgtable.c:48:8: warning: no previous prototype for 'pmd_alloc_one' [-Wmissing-prototypes] 48 | pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) | ^~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/pgtable.c:53:6: warning: no previous prototype for 'pmd_free' [-Wmissing-prototypes] 53 | void pmd_free(struct mm_struct *mm, pmd_t *pmd) | ^~~~~~~~ /kisskb/src/arch/sh/mm/tlbex_32.c:22:1: warning: no previous prototype for 'handle_tlbmiss' [-Wmissing-prototypes] 22 | handle_tlbmiss(struct pt_regs *regs, unsigned long error_code, | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/return_address.c:49:7: warning: no previous prototype for 'return_address' [-Wmissing-prototypes] 49 | void *return_address(unsigned int depth) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/sys_sh.c:58:16: warning: no previous prototype for 'sys_cacheflush' [-Wmissing-prototypes] 58 | asmlinkage int sys_cacheflush(unsigned long addr, unsigned long len, int op) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/traps_32.c:735:6: warning: no previous prototype for 'per_cpu_trap_init' [-Wmissing-prototypes] 735 | void per_cpu_trap_init(void) | ^~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/smp.c:173:17: warning: no previous prototype for 'start_secondary' [-Wmissing-prototypes] 173 | asmlinkage void start_secondary(void) | ^~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/smp.c:324:5: warning: no previous prototype for 'setup_profiling_timer' [-Wmissing-prototypes] 324 | int setup_profiling_timer(unsigned int multiplier) | ^~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/kprobes.c:52:16: warning: no previous prototype for 'arch_copy_kprobe' [-Wmissing-prototypes] 52 | void __kprobes arch_copy_kprobe(struct kprobe *p) | ^~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/kprobes.c:304:15: warning: no previous prototype for 'trampoline_probe_handler' [-Wmissing-prototypes] 304 | int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) | ^~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/hw_breakpoint.c:135:5: warning: no previous prototype for 'arch_bp_generic_fields' [-Wmissing-prototypes] 135 | int arch_bp_generic_fields(int sh_len, int sh_type, | ^~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:68:17: warning: no previous prototype for '__raw_spin_lock' [-Wmissing-prototypes] 68 | void __lockfunc __raw_##op##_lock(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:126:1: note: in expansion of macro 'BUILD_LOCK_OPS' 126 | BUILD_LOCK_OPS(spin, raw_spinlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:80:26: warning: no previous prototype for '__raw_spin_lock_irqsave' [-Wmissing-prototypes] 80 | unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:126:1: note: in expansion of macro 'BUILD_LOCK_OPS' 126 | BUILD_LOCK_OPS(spin, raw_spinlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:98:17: warning: no previous prototype for '__raw_spin_lock_irq' [-Wmissing-prototypes] 98 | void __lockfunc __raw_##op##_lock_irq(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:126:1: note: in expansion of macro 'BUILD_LOCK_OPS' 126 | BUILD_LOCK_OPS(spin, raw_spinlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:103:17: warning: no previous prototype for '__raw_spin_lock_bh' [-Wmissing-prototypes] 103 | void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:126:1: note: in expansion of macro 'BUILD_LOCK_OPS' 126 | BUILD_LOCK_OPS(spin, raw_spinlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:68:17: warning: no previous prototype for '__raw_read_lock' [-Wmissing-prototypes] 68 | void __lockfunc __raw_##op##_lock(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:129:1: note: in expansion of macro 'BUILD_LOCK_OPS' 129 | BUILD_LOCK_OPS(read, rwlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:80:26: warning: no previous prototype for '__raw_read_lock_irqsave' [-Wmissing-prototypes] 80 | unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:129:1: note: in expansion of macro 'BUILD_LOCK_OPS' 129 | BUILD_LOCK_OPS(read, rwlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:98:17: warning: no previous prototype for '__raw_read_lock_irq' [-Wmissing-prototypes] 98 | void __lockfunc __raw_##op##_lock_irq(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:129:1: note: in expansion of macro 'BUILD_LOCK_OPS' 129 | BUILD_LOCK_OPS(read, rwlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:103:17: warning: no previous prototype for '__raw_read_lock_bh' [-Wmissing-prototypes] 103 | void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:129:1: note: in expansion of macro 'BUILD_LOCK_OPS' 129 | BUILD_LOCK_OPS(read, rwlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:68:17: warning: no previous prototype for '__raw_write_lock' [-Wmissing-prototypes] 68 | void __lockfunc __raw_##op##_lock(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:130:1: note: in expansion of macro 'BUILD_LOCK_OPS' 130 | BUILD_LOCK_OPS(write, rwlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:80:26: warning: no previous prototype for '__raw_write_lock_irqsave' [-Wmissing-prototypes] 80 | unsigned long __lockfunc __raw_##op##_lock_irqsave(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:130:1: note: in expansion of macro 'BUILD_LOCK_OPS' 130 | BUILD_LOCK_OPS(write, rwlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:98:17: warning: no previous prototype for '__raw_write_lock_irq' [-Wmissing-prototypes] 98 | void __lockfunc __raw_##op##_lock_irq(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:130:1: note: in expansion of macro 'BUILD_LOCK_OPS' 130 | BUILD_LOCK_OPS(write, rwlock); | ^~~~~~~~~~~~~~ /kisskb/src/kernel/locking/spinlock.c:103:17: warning: no previous prototype for '__raw_write_lock_bh' [-Wmissing-prototypes] 103 | void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \ | ^~~~~~ /kisskb/src/kernel/locking/spinlock.c:130:1: note: in expansion of macro 'BUILD_LOCK_OPS' 130 | BUILD_LOCK_OPS(write, rwlock); | ^~~~~~~~~~~~~~ /kisskb/src/fs/ext4/readpage.c: In function 'ext4_mpage_readpages': /kisskb/src/fs/ext4/readpage.c:392:1: warning: the frame size of 1120 bytes is larger than 1024 bytes [-Wframe-larger-than=] 392 | } | ^ /kisskb/src/arch/sh/boot/compressed/cache.c:2:5: warning: no previous prototype for 'cache_control' [-Wmissing-prototypes] 2 | int cache_control(unsigned int command) | ^~~~~~~~~~~~~ /kisskb/src/arch/sh/boot/compressed/misc.c:115:6: warning: no previous prototype for 'ftrace_stub' [-Wmissing-prototypes] 115 | void ftrace_stub(void) | ^~~~~~~~~~~ /kisskb/src/arch/sh/boot/compressed/misc.c:118:6: warning: no previous prototype for 'arch_ftrace_ops_list_func' [-Wmissing-prototypes] 118 | void arch_ftrace_ops_list_func(void) | ^~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/boot/compressed/misc.c:128:6: warning: no previous prototype for 'decompress_kernel' [-Wmissing-prototypes] 128 | void decompress_kernel(void) | ^~~~~~~~~~~~~~~~~ Kernel: arch/sh/boot/zImage is ready Completed OK # rm -rf /kisskb/build/linus_defconfig_sh4-gcc13 # Build took: 0:01:51.214960