# git rev-parse -q --verify cc7a0bb058b85ea03db87169c60c7cfdd5d34678^{commit} cc7a0bb058b85ea03db87169c60c7cfdd5d34678 already have revision, skipping fetch # git checkout -q -f -B kisskb cc7a0bb058b85ea03db87169c60c7cfdd5d34678 # git clean -qxdf # < git log -1 # commit cc7a0bb058b85ea03db87169c60c7cfdd5d34678 # Author: Tyrel Datwyler # Date: Mon Mar 15 15:48:21 2021 -0600 # # PCI: rpadlpar: Fix potential drc_name corruption in store functions # # Both add_slot_store() and remove_slot_store() try to fix up the # drc_name copied from the store buffer by placing a NUL terminator at # nbyte + 1 or in place of a '\n' if present. However, the static buffer # that we copy the drc_name data into is not zeroed and can contain # anything past the n-th byte. # # This is problematic if a '\n' byte appears in that buffer after nbytes # and the string copied into the store buffer was not NUL terminated to # start with as the strchr() search for a '\n' byte will mark this # incorrectly as the end of the drc_name string resulting in a drc_name # string that contains garbage data after the n-th byte. # # Additionally it will cause us to overwrite that '\n' byte on the stack # with NUL, potentially corrupting data on the stack. # # The following debugging shows an example of the drmgr utility writing # "PHB 4543" to the add_slot sysfs attribute, but add_slot_store() # logging a corrupted string value. # # drmgr: drmgr: -c phb -a -s PHB 4543 -d 1 # add_slot_store: drc_name = PHB 4543°|<82>!, rc = -19 # # Fix this by using strscpy() instead of memcpy() to ensure the string # is NUL terminated when copied into the static drc_name buffer. # Further, since the string is now NUL terminated the code only needs to # change '\n' to '\0' when present. # # Cc: stable@vger.kernel.org # Signed-off-by: Tyrel Datwyler # [mpe: Reformat change log and add mention of possible stack corruption] # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/20210315214821.452959-1-tyreld@linux.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 cc7a0bb058b85ea03db87169c60c7cfdd5d34678 # < make -s -j 10 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 10 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 10 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 10 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- In file included from /kisskb/src/include/linux/kernel.h:10: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 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xdf7730) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xe00000) Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:43:36 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6809467 Bytes = 6649.87 KiB = 6.49 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:43:36 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6839993 Bytes = 6679.68 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:43:36 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6839956 Bytes = 6679.64 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f002a4 INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:43:36 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6841456 Bytes = 6681.11 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:43:36 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6839969 Bytes = 6679.66 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f00314 INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:43:36 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6842132 Bytes = 6681.77 KiB = 6.53 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:43:36 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6841960 Bytes = 6681.60 KiB = 6.53 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:43:36 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6839988 Bytes = 6679.68 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f002a4 INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:43:36 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6841214 Bytes = 6680.87 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f002a4 INFO: Uncompressed kernel (size 0xe07e5c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:43:36 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6839914 Bytes = 6679.60 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:43:41 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6839916 Bytes = 6679.61 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f00314 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:43:41 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6840239 Bytes = 6679.92 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:43:41 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6839918 Bytes = 6679.61 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f00314 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:43:41 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6840037 Bytes = 6679.72 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f002a4 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:43:41 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6840049 Bytes = 6679.74 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f00314 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:43:41 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6840407 Bytes = 6680.08 KiB = 6.52 MiB Load Address: 00f00000 Entry Point: 00f00314 Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-gcc4.9 # Build took: 0:04:18.801182