# 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-8.5.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 87caef42200cd44f8b808ec2f8ac2257f3e0a8c1 # make -s -j 40 ARCH=mips O=/kisskb/build/linus_ip22_defconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- ip22_defconfig # < make -s -j 40 ARCH=mips O=/kisskb/build/linus_ip22_defconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 40 ARCH=mips O=/kisskb/build/linus_ip22_defconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- olddefconfig # make -s -j 40 ARCH=mips O=/kisskb/build/linus_ip22_defconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- /kisskb/src/arch/mips/sgi-ip22/ip22-time.c:119:18: warning: no previous prototype for 'indy_8254timer_irq' [-Wmissing-prototypes] void __irq_entry indy_8254timer_irq(void) ^~~~~~~~~~~~~~~~~~ /kisskb/src/arch/mips/sgi-ip22/ip22-gio.c:249:6: warning: no previous prototype for 'ip22_gio_set_64bit' [-Wmissing-prototypes] void ip22_gio_set_64bit(int slotno) ^~~~~~~~~~~~~~~~~~ /kisskb/src/arch/mips/sgi-ip22/ip22-gio.c:398:12: warning: no previous prototype for 'ip22_gio_init' [-Wmissing-prototypes] int __init ip22_gio_init(void) ^~~~~~~~~~~~~ /kisskb/src/arch/mips/sgi-ip22/ip22-berr.c:89:6: warning: no previous prototype for 'ip22_be_interrupt' [-Wmissing-prototypes] void ip22_be_interrupt(int irq) ^~~~~~~~~~~~~~~~~ /kisskb/src/arch/mips/sgi-ip22/ip22-berr.c:113:13: warning: no previous prototype for 'ip22_be_init' [-Wmissing-prototypes] void __init ip22_be_init(void) ^~~~~~~~~~~~ /kisskb/src/drivers/scsi/sgiwd93.c:173:6: warning: no previous prototype for 'sgiwd93_reset' [-Wmissing-prototypes] void sgiwd93_reset(unsigned long base) ^~~~~~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_ip22_defconfig_mips-gcc8 # Build took: 0:00:55.045659