# 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-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux-ld --version # < git log --format=%s --max-count=1 87caef42200cd44f8b808ec2f8ac2257f3e0a8c1 # make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_defconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- defconfig # < make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_defconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- help # make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_defconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- olddefconfig # make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_defconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' /kisskb/src/arch/sparc/vdso/vma.c:246:12: warning: no previous prototype for 'init_vdso_image' [-Wmissing-prototypes] int __init init_vdso_image(const struct vdso_image *image, ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' /kisskb/src/arch/sparc/kernel/traps_64.c:253:6: warning: no previous prototype for 'is_no_fault_exception' [-Wmissing-prototypes] bool is_no_fault_exception(struct pt_regs *regs) ^ /kisskb/src/arch/sparc/vdso/vclock_gettime.c:254:1: warning: no previous prototype for '__vdso_clock_gettime' [-Wmissing-prototypes] __vdso_clock_gettime(clockid_t clock, struct __kernel_old_timespec *ts) ^ /kisskb/src/arch/sparc/vdso/vclock_gettime.c:282:1: warning: no previous prototype for '__vdso_clock_gettime_stick' [-Wmissing-prototypes] __vdso_clock_gettime_stick(clockid_t clock, struct __kernel_old_timespec *ts) ^ /kisskb/src/arch/sparc/vdso/vclock_gettime.c:307:1: warning: no previous prototype for '__vdso_gettimeofday' [-Wmissing-prototypes] __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz) ^ /kisskb/src/arch/sparc/vdso/vclock_gettime.c:343:1: warning: no previous prototype for '__vdso_gettimeofday_stick' [-Wmissing-prototypes] __vdso_gettimeofday_stick(struct __kernel_old_timeval *tv, struct timezone *tz) ^ /kisskb/src/arch/sparc/kernel/traps_64.c:2035:6: warning: no previous prototype for 'do_mcd_err' [-Wmissing-prototypes] void do_mcd_err(struct pt_regs *regs, struct sun4v_error_entry ent) ^ /kisskb/src/arch/sparc/kernel/traps_64.c:2153:6: warning: no previous prototype for 'sun4v_nonresum_error_user_handled' [-Wmissing-prototypes] bool sun4v_nonresum_error_user_handled(struct pt_regs *regs, ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' In file included from /kisskb/src/arch/sparc/vdso/vdso32/vclock_gettime.c:22:0: /kisskb/src/arch/sparc/vdso/vdso32/../vclock_gettime.c:254:1: warning: no previous prototype for '__vdso_clock_gettime' [-Wmissing-prototypes] __vdso_clock_gettime(clockid_t clock, struct __kernel_old_timespec *ts) ^ /kisskb/src/arch/sparc/vdso/vdso32/../vclock_gettime.c:282:1: warning: no previous prototype for '__vdso_clock_gettime_stick' [-Wmissing-prototypes] __vdso_clock_gettime_stick(clockid_t clock, struct __kernel_old_timespec *ts) ^ /kisskb/src/arch/sparc/vdso/vdso32/../vclock_gettime.c:307:1: warning: no previous prototype for '__vdso_gettimeofday' [-Wmissing-prototypes] __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz) ^ /kisskb/src/arch/sparc/vdso/vdso32/../vclock_gettime.c:343:1: warning: no previous prototype for '__vdso_gettimeofday_stick' [-Wmissing-prototypes] __vdso_gettimeofday_stick(struct __kernel_old_timeval *tv, struct timezone *tz) ^ /kisskb/src/arch/sparc/prom/misc_64.c:165:5: warning: no previous prototype for 'prom_get_mmu_ihandle' [-Wmissing-prototypes] int prom_get_mmu_ihandle(void) ^ /kisskb/src/arch/sparc/prom/p1275.c:52:6: warning: no previous prototype for 'prom_cif_init' [-Wmissing-prototypes] void prom_cif_init(void *cif_handler, void *cif_stack) ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' /kisskb/src/arch/sparc/mm/init_64.c:2644:6: warning: no previous prototype for 'vmemmap_free' [-Wmissing-prototypes] void vmemmap_free(unsigned long start, unsigned long end, ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' /kisskb/src/arch/sparc/kernel/setup_64.c:602:13: warning: no previous prototype for 'alloc_irqstack_bootmem' [-Wmissing-prototypes] void __init alloc_irqstack_bootmem(void) ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' /kisskb/src/arch/sparc/kernel/time_64.c:880:20: warning: no previous prototype for 'sched_clock' [-Wmissing-prototypes] unsigned long long sched_clock(void) ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' /kisskb/src/arch/sparc/kernel/adi_64.c:124:21: warning: no previous prototype for 'find_tag_store' [-Wmissing-prototypes] tag_storage_desc_t *find_tag_store(struct mm_struct *mm, ^ /kisskb/src/arch/sparc/kernel/adi_64.c:156:21: warning: no previous prototype for 'alloc_tag_store' [-Wmissing-prototypes] tag_storage_desc_t *alloc_tag_store(struct mm_struct *mm, ^ /kisskb/src/arch/sparc/kernel/adi_64.c:299:6: warning: no previous prototype for 'del_tag_store' [-Wmissing-prototypes] void del_tag_store(tag_storage_desc_t *tag_desc, struct mm_struct *mm) ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' /kisskb/src/arch/sparc/kernel/pci_sun4v.c:259:15: warning: no previous prototype for 'dma_4v_iotsb_bind' [-Wmissing-prototypes] unsigned long dma_4v_iotsb_bind(unsigned long devhandle, ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' /kisskb/src/arch/sparc/kernel/uprobes.c:237:17: warning: no previous prototype for 'uprobe_trap' [-Wmissing-prototypes] asmlinkage void uprobe_trap(struct pt_regs *regs, ^ cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' WARNING: modpost: EXPORT symbol "_mcount" [vmlinux] version generation failed, symbol will not be versioned. Is "_mcount" prototyped in ? Completed OK # rm -rf /kisskb/build/linus_defconfig_sparc64-gcc5 # Build took: 0:00:47.086057