# git rev-parse -q --verify 478036c4cd1a16e613a2f883d79c03cf187faacb^{commit} 478036c4cd1a16e613a2f883d79c03cf187faacb already have revision, skipping fetch # git checkout -q -f -B kisskb 478036c4cd1a16e613a2f883d79c03cf187faacb # git clean -qxdf # < git log -1 # commit 478036c4cd1a16e613a2f883d79c03cf187faacb # Author: Michael Ellerman # Date: Mon Jun 14 23:14:40 2021 +1000 # # powerpc: Fix initrd corruption with relative jump labels # # Commit b0b3b2c78ec0 ("powerpc: Switch to relative jump labels") switched # us to using relative jump labels. That involves changing the code, # target and key members in struct jump_entry to be relative to the # address of the jump_entry, rather than absolute addresses. # # We have two static inlines that create a struct jump_entry, # arch_static_branch() and arch_static_branch_jump(), as well as an asm # macro ARCH_STATIC_BRANCH, which is used by the pseries-only hypervisor # tracing code. # # Unfortunately we missed updating the key to be a relative reference in # ARCH_STATIC_BRANCH. # # That causes a pseries kernel to have a handful of jump_entry structs # with bad key values. Instead of being a relative reference they instead # hold the full address of the key. # # However the code doesn't expect that, it still adds the key value to the # address of the jump_entry (see jump_entry_key()) expecting to get a # pointer to a key somewhere in kernel data. # # The table of jump_entry structs sits in rodata, which comes after the # kernel text. In a typical build this will be somewhere around 15MB. The # address of the key will be somewhere in data, typically around 20MB. # Adding the two values together gets us a pointer somewhere around 45MB. # # We then call static_key_set_entries() with that bad pointer and modify # some members of the struct static_key we think we are pointing at. # # A pseries kernel is typically ~30MB in size, so writing to ~45MB won't # corrupt the kernel itself. However if we're booting with an initrd, # depending on the size and exact location of the initrd, we can corrupt # the initrd. Depending on how exactly we corrupt the initrd it can either # cause the system to not boot, or just corrupt one of the files in the # initrd. # # The fix is simply to make the key value relative to the jump_entry # struct in the ARCH_STATIC_BRANCH macro. # # Fixes: b0b3b2c78ec0 ("powerpc: Switch to relative jump labels") # Reported-by: Anastasia Kovaleva # Reported-by: Roman Bolshakov # Reported-by: Greg Kurz # Reported-by: Daniel Axtens # Signed-off-by: Michael Ellerman # Tested-by: Daniel Axtens # Tested-by: Greg Kurz # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/20210614131440.312360-1-mpe@ellerman.id.au # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 478036c4cd1a16e613a2f883d79c03cf187faacb # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_smp_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/net/sched/sch_frag.c: In function 'sch_fragment': /kisskb/src/net/sched/sch_frag.c:93:10: warning: missing braces around initializer [-Wmissing-braces] struct rtable sch_frag_rt = { 0 }; ^ /kisskb/src/net/sched/sch_frag.c:93:10: warning: (near initialization for 'sch_frag_rt.dst') [-Wmissing-braces] In file included from /kisskb/src/include/linux/kernel.h:11:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:12, from /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:15: /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/include/linux/err.h:22:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO) ^ /kisskb/src/include/linux/compiler.h:78:42: note: in definition of macro 'unlikely' # define unlikely(x) __builtin_expect(!!(x), 0) ^ /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:6: note: in expansion of macro 'IS_ERR_VALUE' if (IS_ERR_VALUE(fep->ring_mem_addr)) ^ /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8541cds.dts:330.3-21: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) /kisskb/src/arch/powerpc/boot/dts/fsl/mpc8555cds.dts:330.3-21: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) INFO: Uncompressed kernel (size 0xe21390) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe21390) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe21390) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe21390) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe21390) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe21390) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe21390) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe21390) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe21390) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe21390) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe21390) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe21390) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe21390) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe21390) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe21390) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe10c64) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) Image Name: Linux-5.13.0-rc2-g478036c4cd1a Created: Thu Jun 17 03:22:29 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6857208 Bytes = 6696.49 KiB = 6.54 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.13.0-rc2-g478036c4cd1a Created: Thu Jun 17 03:22:32 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6887414 Bytes = 6725.99 KiB = 6.57 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.13.0-rc2-g478036c4cd1a Created: Thu Jun 17 03:22:32 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6889775 Bytes = 6728.30 KiB = 6.57 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.13.0-rc2-g478036c4cd1a Created: Thu Jun 17 03:22:31 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6887408 Bytes = 6725.98 KiB = 6.57 MiB Load Address: 00f00000 Entry Point: 00f00314 Image Name: Linux-5.13.0-rc2-g478036c4cd1a Created: Thu Jun 17 03:22:32 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6887937 Bytes = 6726.50 KiB = 6.57 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.13.0-rc2-g478036c4cd1a Created: Thu Jun 17 03:22:33 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6887779 Bytes = 6726.35 KiB = 6.57 MiB Load Address: 00f00000 Entry Point: 00f00314 Image Name: Linux-5.13.0-rc2-g478036c4cd1a Created: Thu Jun 17 03:22:33 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6887370 Bytes = 6725.95 KiB = 6.57 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.13.0-rc2-g478036c4cd1a Created: Thu Jun 17 03:22:33 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6887898 Bytes = 6726.46 KiB = 6.57 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.13.0-rc2-g478036c4cd1a Created: Thu Jun 17 03:22:33 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6887949 Bytes = 6726.51 KiB = 6.57 MiB Load Address: 00f00000 Entry Point: 00f00314 Image Name: Linux-5.13.0-rc2-g478036c4cd1a Created: Thu Jun 17 03:22:33 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6887890 Bytes = 6726.46 KiB = 6.57 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.13.0-rc2-g478036c4cd1a Created: Thu Jun 17 03:22:33 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6888680 Bytes = 6727.23 KiB = 6.57 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.13.0-rc2-g478036c4cd1a Created: Thu Jun 17 03:22:33 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6889790 Bytes = 6728.31 KiB = 6.57 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.13.0-rc2-g478036c4cd1a Created: Thu Jun 17 03:22:33 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6887955 Bytes = 6726.52 KiB = 6.57 MiB Load Address: 00f00000 Entry Point: 00f00314 Image Name: Linux-5.13.0-rc2-g478036c4cd1a Created: Thu Jun 17 03:22:33 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6888222 Bytes = 6726.78 KiB = 6.57 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.13.0-rc2-g478036c4cd1a Created: Thu Jun 17 03:22:33 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6887410 Bytes = 6725.99 KiB = 6.57 MiB Load Address: 00f00000 Entry Point: 00f00314 Image Name: Linux-5.13.0-rc2-g478036c4cd1a Created: Thu Jun 17 03:22:33 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6889053 Bytes = 6727.59 KiB = 6.57 MiB Load Address: 00f00000 Entry Point: 00f002a4 Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-gcc4.9 # Build took: 0:02:13.304053