# 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 160 ARCH=sh O=/kisskb/build/linus_allmodconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 160 ARCH=sh O=/kisskb/build/linus_allmodconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 160 ARCH=sh O=/kisskb/build/linus_allmodconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 160 ARCH=sh O=/kisskb/build/linus_allmodconfig_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/math-emu/math.c:492:5: error: no previous prototype for 'do_fpu_inst' [-Werror=missing-prototypes] 492 | int do_fpu_inst(unsigned short inst, struct pt_regs *regs) | ^~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:85: Warning: overflow in branch to __restore_all; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:357: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:360: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/mm/cache-sh2.c:85:13: error: no previous prototype for 'sh2_cache_init' [-Werror=missing-prototypes] 85 | void __init sh2_cache_init(void) | ^~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sh/mm/cache-sh2.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sh/mm] Error 2 make[4]: *** Waiting for unfinished jobs.... cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sh/math-emu/math.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sh/math-emu] Error 2 /kisskb/src/arch/sh/kernel/cpu/init.c:99:29: error: no previous prototype for 'l2_cache_init' [-Werror=missing-prototypes] 99 | void __attribute__ ((weak)) l2_cache_init(void) | ^~~~~~~~~~~~~ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sh/kernel/cpu/init.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sh/kernel/cpu] Error 2 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sh/kernel] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sh] Error 2 make[3]: *** Waiting for unfinished jobs.... {standard input}: Assembler messages: {standard input}: Warning: end of file not at end of a line; newline inserted {standard input}:1099: Error: missing operand {standard input}:1099: Error: missing operand {standard input}:1099: Error: invalid operands for opcode {standard input}: Error: open CFI at the end of file; missing .cfi_endproc directive sh4-linux-gcc: internal compiler error: Segmentation fault signal terminated program cc1 Please submit a full bug report, with preprocessed source (by using -freport-bug). See for instructions. make[6]: *** [/kisskb/src/scripts/Makefile.build:244: drivers/net/pcs/pcs-xpcs.o] Error 4 make[5]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/net/pcs] Error 2 make[5]: *** Waiting for unfinished jobs.... {standard input}: Assembler messages: {standard input}: Warning: end of file not at end of a line; newline inserted {standard input}:609: Error: unknown pseudo-op: `.cfi_def_cfa_off' {standard input}: Error: open CFI at the end of file; missing .cfi_endproc directive {standard input}:548: Error: pcrel too far {standard input}:550: Error: pcrel too far {standard input}:557: Error: pcrel too far {standard input}:559: Error: pcrel too far {standard input}:566: Error: pcrel too far {standard input}:568: Error: pcrel too far {standard input}:575: Error: pcrel too far {standard input}:577: Error: pcrel too far {standard input}:584: Error: pcrel too far {standard input}:586: Error: pcrel too far {standard input}:593: Error: pcrel too far {standard input}:595: Error: pcrel too far sh4-linux-gcc: internal compiler error: Segmentation fault signal terminated program cc1 Please submit a full bug report, with preprocessed source (by using -freport-bug). See for instructions. make[6]: *** [/kisskb/src/scripts/Makefile.build:244: drivers/hwmon/pmbus/mp2975.o] Error 4 make[5]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/hwmon/pmbus] Error 2 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/hwmon] Error 2 make[4]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/net] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:485: drivers] Error 2 make[2]: *** [/kisskb/src/Makefile:1919: .] Error 2 make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 160 ARCH=sh O=/kisskb/build/linus_allmodconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_sh4-gcc13 # Build took: 0:07:59.563609