# git rev-parse -q --verify b49f9d9b0e428909796b4a7e7f1049f489859e0f^{commit} b49f9d9b0e428909796b4a7e7f1049f489859e0f already have revision, skipping fetch # git checkout -q -f -B kisskb b49f9d9b0e428909796b4a7e7f1049f489859e0f # git clean -qxdf # < git log -1 # commit b49f9d9b0e428909796b4a7e7f1049f489859e0f # Author: Naveen N. Rao # Date: Wed May 19 16:17:17 2021 +0530 # # powerpc/kprobes: Fix validation of prefixed instructions across page boundary # # When checking if the probed instruction is the suffix of a prefixed # instruction, we access the instruction at the previous word. If the # probed instruction is the very first word of a module, we can end up # trying to access an invalid page. # # Fix this by skipping the check for all instructions at the beginning of # a page. Prefixed instructions cannot cross a 64-byte boundary and as # such, we don't expect to encounter a suffix as the very first word in a # page for kernel text. Even if there are prefixed instructions crossing # a page boundary (from a module, for instance), the instruction will be # illegal, so preventing probing on the suffix of such prefix instructions # isn't worthwhile. # # Fixes: b4657f7650ba ("powerpc/kprobes: Don't allow breakpoints on suffixes") # Cc: stable@vger.kernel.org # v5.8+ # Reported-by: Christophe Leroy # Signed-off-by: Naveen N. Rao # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/0df9a032a05576a2fa8e97d1b769af2ff0eafbd6.1621416666.git.naveen.n.rao@linux.vnet.ibm.com # < /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 b49f9d9b0e428909796b4a7e7f1049f489859e0f # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_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_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_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 0xd76ef0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd76ef0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd76ef0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd76ef0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd76ef0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd76ef0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd76ef0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd76ef0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd76ef0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd76ef0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd76ef0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd76ef0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd76ef0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd76ef0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd76ef0) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) INFO: Uncompressed kernel (size 0xd667c4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) Image Name: Linux-5.13.0-rc2-112579-gb49f9d9 Created: Sat May 22 01:17:59 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6510504 Bytes = 6357.91 KiB = 6.21 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.13.0-rc2-112579-gb49f9d9 Created: Sat May 22 01:18:01 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6542188 Bytes = 6388.86 KiB = 6.24 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.13.0-rc2-112579-gb49f9d9 Created: Sat May 22 01:18:01 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6541871 Bytes = 6388.55 KiB = 6.24 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.13.0-rc2-112579-gb49f9d9 Created: Sat May 22 01:18:01 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6541503 Bytes = 6388.19 KiB = 6.24 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.13.0-rc2-112579-gb49f9d9 Created: Sat May 22 01:18:01 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6542076 Bytes = 6388.75 KiB = 6.24 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.13.0-rc2-112579-gb49f9d9 Created: Sat May 22 01:18:02 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6542578 Bytes = 6389.24 KiB = 6.24 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.13.0-rc2-112579-gb49f9d9 Created: Sat May 22 01:18:02 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6542181 Bytes = 6388.85 KiB = 6.24 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.13.0-rc2-112579-gb49f9d9 Created: Sat May 22 01:18:02 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6541801 Bytes = 6388.48 KiB = 6.24 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.13.0-rc2-112579-gb49f9d9 Created: Sat May 22 01:18:02 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6542063 Bytes = 6388.73 KiB = 6.24 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.13.0-rc2-112579-gb49f9d9 Created: Sat May 22 01:18:02 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6543865 Bytes = 6390.49 KiB = 6.24 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.13.0-rc2-112579-gb49f9d9 Created: Sat May 22 01:18:02 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6541460 Bytes = 6388.14 KiB = 6.24 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.13.0-rc2-112579-gb49f9d9 Created: Sat May 22 01:18:02 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6543045 Bytes = 6389.69 KiB = 6.24 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.13.0-rc2-112579-gb49f9d9 Created: Sat May 22 01:18:02 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6541505 Bytes = 6388.19 KiB = 6.24 MiB Load Address: 00e00000 Entry Point: 00e00314 Image Name: Linux-5.13.0-rc2-112579-gb49f9d9 Created: Sat May 22 01:18:02 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6541494 Bytes = 6388.18 KiB = 6.24 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.13.0-rc2-112579-gb49f9d9 Created: Sat May 22 01:18:02 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6541795 Bytes = 6388.47 KiB = 6.24 MiB Load Address: 00e00000 Entry Point: 00e002a4 Image Name: Linux-5.13.0-rc2-112579-gb49f9d9 Created: Sat May 22 01:18:02 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6543825 Bytes = 6390.45 KiB = 6.24 MiB Load Address: 00e00000 Entry Point: 00e002a4 Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_defconfig_powerpc-gcc4.9 # Build took: 0:02:08.736833