Changes in Makefile

7f7f6f7a - Makefile: remove redundant tool coverage variables

Mon, 06 May 2024 13:35:43 +0000

Makefile: remove redundant tool coverage variablesNow Kbuild provides reasonable defaults for objtool, sanitizers, andprofilers.Remove redundant variables.Note:This commit changes the coverage for some objects: - include arch/mips/vdso/vdso-image.o into UBSAN, GCOV, KCOV - include arch/sparc/vdso/vdso-image-*.o into UBSAN - include arch/sparc/vdso/vma.o into UBSAN - include arch/x86/entry/vdso/extable.o into KASAN, KCSAN, UBSAN, GCOV, KCOV - include arch/x86/entry/vdso/vdso-image-*.o into KASAN, KCSAN, UBSAN, GCOV, KCOV - include arch/x86/entry/vdso/vdso32-setup.o into KASAN, KCSAN, UBSAN, GCOV, KCOV - include arch/x86/entry/vdso/vma.o into GCOV, KCOV - include arch/x86/um/vdso/vma.o into KASAN, GCOV, KCOVI believe these are positive effects because all of them are kernelspace objects.Signed-off-by: Masahiro Yamada Reviewed-by: Kees Cook Tested-by: Roberto Sassu List of files: /linux-6.15/drivers/misc/lkdtm/Makefile

fb28a886 - lkdtm: Disable CFI checking for perms functions

Tue, 30 Apr 2024 23:49:57 +0000

lkdtm: Disable CFI checking for perms functionsThe EXEC_RODATA test plays a lot of tricks to live in the .rodata section,and once again ran into objtool's (completely reasonable) assumptionsthat executable code should live in an executable section. However, thismanifested only under CONFIG_CFI_CLANG=y, as one of the .cfi_sites waspointing into the .rodata section.Since we're testing non-CFI execution properties in perms.c (androdata.c), we can disable CFI for the involved functions, and remove theCFI arguments from rodata.c entirely.Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-lkp/202308301532.d7acf63e-oliver.sang@intel.comFixes: 6342a20efbd8 ("objtool: Add elf_create_section_pair()")Link: https://lore.kernel.org/r/20240430234953.work.760-kees@kernel.orgSigned-off-by: Kees Cook List of files: /linux-6.15/drivers/misc/lkdtm/Makefile

efc72a66 - lkdtm: Disable return thunks in rodata.c

Mon, 18 Jul 2022 14:50:25 +0000

lkdtm: Disable return thunks in rodata.cThe following warning was seen: WARNING: CPU: 0 PID: 0 at arch/x86/kernel/alternative.c:557 apply_returns (arch/x86/kernel/alternative.c:557 (discriminator 1)) Modules linked in: CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.19.0-rc4-00008-gee88d363d156 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.0-debian-1.16.0-4 04/01/2014 RIP: 0010:apply_returns (arch/x86/kernel/alternative.c:557 (discriminator 1)) Code: ff ff 74 cb 48 83 c5 04 49 39 ee 0f 87 81 fe ff ff e9 22 ff ff ff 0f 0b 48 83 c5 04 49 39 ee 0f 87 6d fe ff ff e9 0e ff ff ff <0f> 0b 48 83 c5 04 49 39 ee 0f 87 59 fe ff ff e9 fa fe ff ff 48 89The warning happened when apply_returns() failed to convert "JMP__x86_return_thunk" to RET. It was instead a JMP to nowhere, due to thethunk relocation not getting resolved.That rodata.o code is objcopy'd to .rodata, and later memcpy'd, sorelocations don't work (and are apparently silently ignored).LKDTM is only used for testing, so the naked RET should be fine. Sojust disable return thunks for that file.While at it, disable objtool and KCSAN for the file.Fixes: 0b53c374b9ef ("x86/retpoline: Use -mfunction-return")Reported-by: kernel test robot Debugged-by: Peter Zijlstra Signed-off-by: Josh Poimboeuf Signed-off-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/lkml/Ys58BxHxoDZ7rfpr@xsang-OptiPlex-9020/ List of files: /linux-6.15/drivers/misc/lkdtm/Makefile

bc93a22a - lkdtm: Fix content of section containing lkdtm_rodata_do_nothing()

Fri, 08 Oct 2021 16:58:40 +0000

lkdtm: Fix content of section containing lkdtm_rodata_do_nothing()On a kernel without CONFIG_STRICT_KERNEL_RWX, running EXEC_RODATAtest leads to "Illegal instruction" failure.Looking at the content of rodata_objcopy.o, we see that thefunction content zeroes only: Disassembly of section .rodata: 0000000000000000 <.lkdtm_rodata_do_nothing>: 0: 00 00 00 00 .long 0x0Add the contents flag in order to keep the content of the sectionwhile renaming it. Disassembly of section .rodata: 0000000000000000 <.lkdtm_rodata_do_nothing>: 0: 4e 80 00 20 blrFixes: e9e08a07385e ("lkdtm: support llvm-objcopy")Cc: stable@vger.kernel.orgCc: Kees Cook Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Cc: Nick Desaulniers Cc: Nathan Chancellor Signed-off-by: Christophe Leroy Reviewed-by: Nick Desaulniers Signed-off-by: Kees Cook Link: https://lore.kernel.org/r/8900731fbc05fb8b0de18af7133a8fc07c3c53a1.1633712176.git.christophe.leroy@csgroup.eu List of files: /linux-6.15/drivers/misc/lkdtm/Makefile

c2857374 - powerpc/64s: Make hash MMU support configurable

Wed, 01 Dec 2021 14:41:51 +0000

powerpc/64s: Make hash MMU support configurableThis adds Kconfig selection which allows 64s hash MMU support to bedisabled. It can be disabled if radix support is enabled, the minimumsupported CPU type is POWER9 (or higher), and KVM is not selected.Signed-off-by: Nicholas Piggin Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20211201144153.2456614-17-npiggin@gmail.com List of files: /linux-6.15/drivers/misc/lkdtm/Makefile

01dd633e - drivers/misc/lkdtm: disable LTO for rodata.o

Fri, 11 Dec 2020 18:46:30 +0000

drivers/misc/lkdtm: disable LTO for rodata.oDisable LTO for rodata.o to allow objcopy to be used tomanipulate sections.Signed-off-by: Sami Tolvanen Acked-by: Kees Cook Signed-off-by: Kees Cook Link: https://lore.kernel.org/r/20201211184633.3213045-14-samitolvanen@google.com List of files: /linux-6.15/drivers/misc/lkdtm/Makefile

febebaf3 - drivers/misc/lkdtm: add new file in LKDTM to test fortified strscpy

Wed, 16 Dec 2020 04:43:54 +0000

drivers/misc/lkdtm: add new file in LKDTM to test fortified strscpyThis new test ensures that fortified strscpy has the same behavior thanvanilla strscpy (e.g. returning -E2BIG when src content is truncated).Finally, it generates a crash at runtime because there is a write overflowin destination string.Link: https://lkml.kernel.org/r/20201122162451.27551-5-laniel_francis@privacyrequired.comSigned-off-by: Francis Laniel Reviewed-by: Kees Cook Cc: Daniel Axtens Cc: Daniel Micay Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds List of files: /linux-6.15/drivers/misc/lkdtm/Makefile

6d5a88cd - lkdtm: disable KASAN for rodata.o

Tue, 15 Dec 2020 03:09:24 +0000

lkdtm: disable KASAN for rodata.oBuilding lkdtm with KASAN and Clang 11 or later results in the followingerror when attempting to load the module: kernel tried to execute NX-protected page - exploit attempt? (uid: 0) BUG: unable to handle page fault for address: ffffffffc019cd70 #PF: supervisor instruction fetch in kernel mode #PF: error_code(0x0011) - permissions violation ... RIP: 0010:asan.module_ctor+0x0/0xffffffffffffa290 [lkdtm] ... Call Trace: do_init_module+0x17c/0x570 load_module+0xadee/0xd0b0 __x64_sys_finit_module+0x16c/0x1a0 do_syscall_64+0x34/0x50 entry_SYSCALL_64_after_hwframe+0x44/0xa9The reason is that rodata.o generates a dummy function that lives in.rodata to validate that .rodata can't be executed; however, Clang 11 addsKASAN globals support by generating module constructors to initializeglobals redzones. When Clang 11 adds a module constructor to rodata.o, itis also added to .rodata: any attempt to call it on initialization resultsin the above error.Therefore, disable KASAN instrumentation for rodata.o.Link: https://lkml.kernel.org/r/20201214191413.3164796-1-elver@google.comSigned-off-by: Marco Elver Cc: Kees Cook Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Cc: Andrey Konovalov Cc: Dmitry Vyukov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds List of files: /linux-6.15/drivers/misc/lkdtm/Makefile

3f618ab3 - lkdtm: don't move ctors to .rodata

Mon, 07 Dec 2020 17:05:33 +0000

lkdtm: don't move ctors to .rodataWhen building with KASAN and LKDTM, clang may implictly generate anasan.module_ctor function in the LKDTM rodata object. The Makefile movesthe lkdtm_rodata_do_nothing() function into .rodata by renaming thefile's .text section to .rodata, and consequently also moves the ctorfunction into .rodata, leading to a boot time crash (splat below) whenthe ctor is invoked by do_ctors().Let's prevent this by marking the function as noinstr rather thannotrace, and renaming the file's .noinstr.text to .rodata. Marking thefunction as noinstr will prevent tracing and kprobes, and will inhibitany undesireable compiler instrumentation.The ctor function (if any) will be placed in .text and will workcorrectly.Example splat before this patch is applied:[ 0.916359] Unable to handle kernel execute from non-executable memory at virtual address ffffa0006b60f5ac[ 0.922088] Mem abort info:[ 0.922828] ESR = 0x8600000e[ 0.923635] EC = 0x21: IABT (current EL), IL = 32 bits[ 0.925036] SET = 0, FnV = 0[ 0.925838] EA = 0, S1PTW = 0[ 0.926714] swapper pgtable: 4k pages, 48-bit VAs, pgdp=00000000427b3000[ 0.928489] [ffffa0006b60f5ac] pgd=000000023ffff003, p4d=000000023ffff003, pud=000000023fffe003, pmd=0068000042000f01[ 0.931330] Internal error: Oops: 8600000e [#1] PREEMPT SMP[ 0.932806] Modules linked in:[ 0.933617] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.10.0-rc7 #2[ 0.935620] Hardware name: linux,dummy-virt (DT)[ 0.936924] pstate: 40400005 (nZcv daif +PAN -UAO -TCO BTYPE=--)[ 0.938609] pc : asan.module_ctor+0x0/0x14[ 0.939759] lr : do_basic_setup+0x4c/0x70[ 0.940889] sp : ffff27b600177e30[ 0.941815] x29: ffff27b600177e30 x28: 0000000000000000[ 0.943306] x27: 0000000000000000 x26: 0000000000000000[ 0.944803] x25: 0000000000000000 x24: 0000000000000000[ 0.946289] x23: 0000000000000001 x22: 0000000000000000[ 0.947777] x21: ffffa0006bf4a890 x20: ffffa0006befb6c0[ 0.949271] x19: ffffa0006bef9358 x18: 0000000000000068[ 0.950756] x17: fffffffffffffff8 x16: 0000000000000000[ 0.952246] x15: 0000000000000000 x14: 0000000000000000[ 0.953734] x13: 00000000838a16d5 x12: 0000000000000001[ 0.955223] x11: ffff94000da74041 x10: dfffa00000000000[ 0.956715] x9 : 0000000000000000 x8 : ffffa0006b60f5ac[ 0.958199] x7 : f9f9f9f9f9f9f9f9 x6 : 000000000000003f[ 0.959683] x5 : 0000000000000040 x4 : 0000000000000000[ 0.961178] x3 : ffffa0006bdc15a0 x2 : 0000000000000005[ 0.962662] x1 : 00000000000000f9 x0 : ffffa0006bef9350[ 0.964155] Call trace:[ 0.964844] asan.module_ctor+0x0/0x14[ 0.965895] kernel_init_freeable+0x158/0x198[ 0.967115] kernel_init+0x14/0x19c[ 0.968104] ret_from_fork+0x10/0x30[ 0.969110] Code: 00000003 00000000 00000000 00000000 (00000000)[ 0.970815] ---[ end trace b5339784e20d015c ]---Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Cc: Kees Cook Acked-by: Kees Cook Signed-off-by: Mark Rutland Link: https://lore.kernel.org/r/20201207170533.10738-1-mark.rutland@arm.comSigned-off-by: Greg Kroah-Hartman List of files: /linux-6.15/drivers/misc/lkdtm/Makefile

3ba150fb - lkdtm/powerpc: Add SLB multihit test

Mon, 30 Nov 2020 08:30:57 +0000

lkdtm/powerpc: Add SLB multihit testTo check machine check handling, add support to inject slbmultihit errors.Co-developed-by: Mahesh Salgaonkar Signed-off-by: Mahesh Salgaonkar Signed-off-by: Ganesh Goudar [mpe: Use CONFIG_PPC_BOOK3S_64 to fix compile errors reported by lkp@intel.com]Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20201130083057.135610-1-ganeshgr@linux.ibm.com List of files: /linux-6.15/drivers/misc/lkdtm/Makefile

b0eb93cf - lkdtm: Add Control Flow Integrity test

Thu, 08 Aug 2019 18:37:45 +0000

lkdtm: Add Control Flow Integrity testThis adds a simple test for forward CFI (indirect function calls) withfunction prototype granularity (as implemented by Clang's CFI).Signed-off-by: Kees Cook List of files: /linux-6.15/drivers/misc/lkdtm/Makefile

e9e08a07 - lkdtm: support llvm-objcopy

Wed, 15 May 2019 18:24:41 +0000

lkdtm: support llvm-objcopyWith CONFIG_LKDTM=y and make OBJCOPY=llvm-objcopy, llvm-objcopy errors:llvm-objcopy: error: --set-section-flags=.text conflicts with--rename-section=.text=.rodataRather than support setting flags then renaming sections vs renamingthen setting flags, it's simpler to just change both at the same timevia --rename-section. Adding the load flag is required for GNU objcopyto mark .rodata Type as PROGBITS after the rename.This can be verified with:$ readelf -S drivers/misc/lkdtm/rodata_objcopy.o...Section Headers: [Nr] Name Type Address Offset Size EntSize Flags Link Info Align... [ 1] .rodata PROGBITS 0000000000000000 00000040 0000000000000004 0000000000000000 A 0 0 4...Which shows that .text is now renamed .rodata, the alloc flag A is set,the type is PROGBITS, and the section is not flagged as writeable W.Cc: stable@vger.kernel.orgLink: https://sourceware.org/bugzilla/show_bug.cgi?id=24554Link: https://github.com/ClangBuiltLinux/linux/issues/448Reported-by: Nathan Chancellor Suggested-by: Alan Modra Suggested-by: Jordan Rupprect Suggested-by: Kees Cook Acked-by: Kees Cook Reviewed-by: Nathan Chancellor Signed-off-by: Nick Desaulniers Signed-off-by: Greg Kroah-Hartman List of files: /linux-6.15/drivers/misc/lkdtm/Makefile

f90d1e0c - lkdtm: Add a test for STACKLEAK

Thu, 16 Aug 2018 22:17:00 +0000

lkdtm: Add a test for STACKLEAKIntroduce an lkdtm test for the STACKLEAK feature: check that thecurrent task stack is properly erased (filled with STACKLEAK_POISON).Signed-off-by: Alexander Popov Signed-off-by: Tycho Andersen Tested-by: Laura Abbott Signed-off-by: Kees Cook List of files: /linux-6.15/drivers/misc/lkdtm/Makefile

039a1c42 - lkdtm: Relocate code to subdirectory

Tue, 06 Mar 2018 22:58:09 +0000

lkdtm: Relocate code to subdirectoryThe LKDTM modules keep expanding, and it's getting weird to have each fileget a prefix. Instead, move to a subdirectory for cleaner handling.Signed-off-by: Kees Cook Signed-off-by: Greg Kroah-Hartman List of files: /linux-6.15/drivers/misc/lkdtm/Makefile