# git rev-parse -q --verify b86f6789c355a86ff6c3a8d5ab24774fd66a5a51^{commit} b86f6789c355a86ff6c3a8d5ab24774fd66a5a51 already have revision, skipping fetch # git checkout -q -f -B kisskb b86f6789c355a86ff6c3a8d5ab24774fd66a5a51 # git clean -qxdf # < git log -1 # commit b86f6789c355a86ff6c3a8d5ab24774fd66a5a51 # Author: Michael Ellerman # Date: Mon Mar 16 23:44:21 2020 +1100 # # powerpc/64: Prevent stack protection in early boot # # The previous commit reduced the amount of code that is run before we # setup a paca. However there are still a few remaining functions that # run with no paca, or worse, with an arbitrary value in r13 that will # be used as a paca pointer. # # In particular the stack protector canary is stored in the paca, so if # stack protector is activated for any of these functions we will read # the stack canary from wherever r13 points. If r13 happens to point # outside of memory we will get a machine check / checkstop. # # For example if we modify initialise_paca() to trigger stack # protection, and then boot in the mambo simulator with r13 poisoned in # skiboot before calling the kernel: # # DEBUG: 19952232: (19952232): INSTRUCTION: PC=0xC0000000191FC1E8: [0x3C4C006D]: addis r2,r12,0x6D [fetch] # DEBUG: 19952236: (19952236): INSTRUCTION: PC=0xC00000001807EAD8: [0x7D8802A6]: mflr r12 [fetch] # FATAL ERROR: 19952276: (19952276): Check Stop for 0:0: Machine Check with ME bit of MSR off # DEBUG: 19952276: (19952276): INSTRUCTION: PC=0xC0000000191FCA7C: [0xE90D0CF8]: ld r8,0xCF8(r13) [Instruction Failed] # INFO: 19952276: (19952277): ** Execution stopped: Mambo Error, Machine Check Stop, ** # systemsim % bt # pc: 0xC0000000191FCA7C initialise_paca+0x54 # lr: 0xC0000000191FC22C early_setup+0x44 # stack:0x00000000198CBED0 0x0 +0x0 # stack:0x00000000198CBF00 0xC0000000191FC22C early_setup+0x44 # stack:0x00000000198CBF90 0x1801C968 +0x1801C968 # # So annotate the relevant functions to ensure stack protection is never # enabled for them. # # Fixes: 06ec27aea9fc ("powerpc/64: add stack protector support") # Cc: stable@vger.kernel.org # v4.20+ # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/20200316124421.99211-2-mpe@ellerman.id.au # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 b86f6789c355a86ff6c3a8d5ab24774fd66a5a51 # < make -s -j 160 ARCH=mips O=/kisskb/build/powerpc-next_mips-defconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- defconfig # < make -s -j 160 ARCH=mips O=/kisskb/build/powerpc-next_mips-defconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- help # make -s -j 160 ARCH=mips O=/kisskb/build/powerpc-next_mips-defconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- olddefconfig # make -s -j 160 ARCH=mips O=/kisskb/build/powerpc-next_mips-defconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- FIT description: Linux 5.6.0-rc2-gb86f6789c355 Created: Thu Mar 19 01:03:30 2020 Image 0 (kernel@0) Description: Linux 5.6.0-rc2-gb86f6789c355 Created: Thu Mar 19 01:03:30 2020 Type: Kernel Image Compression: gzip compressed Data Size: 4906317 Bytes = 4791.33 KiB = 4.68 MiB Architecture: MIPS OS: Linux Load Address: 0x80100000 Entry Point: 0x808ffe90 Hash algo: sha1 Hash value: f174068d73f3c8641631056826253333fc2b7401 Image 1 (fdt@boston) Description: img,boston Device Tree Created: Thu Mar 19 01:03:30 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Thu Mar 19 01:03:30 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@ocelot_pcb123) Description: MSCC Ocelot PCB123 Device Tree Created: Thu Mar 19 01:03:30 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 4639 Bytes = 4.53 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 018897896b42c41c943aca35a20e4300dba250c8 Image 4 (fdt@ocelot_pcb120) Description: MSCC Ocelot PCB120 Device Tree Created: Thu Mar 19 01:03:30 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 5198 Bytes = 5.08 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 36c7bd0bd79cfc2f7dd6acda6c7996294f4967e6 Image 5 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Thu Mar 19 01:03:30 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 63d058b780f65e22da30f0a183433765f1807f1d Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@ocelot_pcb123) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb123 Configuration 4 (conf@ocelot_pcb120) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb120 Configuration 5 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/powerpc-next_mips-defconfig_mips-gcc4.9 # Build took: 0:00:54.020353