# 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_ppc44x_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc44x_defconfig # < make -s -j 10 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc44x_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_ppc44x_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_ppc44x_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/block/genhd.c: In function 'diskstats_show': /kisskb/src/block/genhd.c:1313:1: warning: the frame size of 1160 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ /kisskb/src/lib/zstd/compress.c: In function 'ZSTD_compressBlock_doubleFast': /kisskb/src/lib/zstd/compress.c:1393:1: warning: the frame size of 1584 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ INFO: Uncompressed kernel (size 0x6139c8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x6139c8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x6139c8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x6139c8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x6139c8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x6139c8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x6139c8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x6139c8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x6139c8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x6139c8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:45:41 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3116440 Bytes = 3043.40 KiB = 2.97 MiB Load Address: 00700000 Entry Point: 007000c4 INFO: Uncompressed kernel (size 0x6139c8) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:45:42 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3117234 Bytes = 3044.17 KiB = 2.97 MiB Load Address: 00700000 Entry Point: 007001b8 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:45:42 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3117191 Bytes = 3044.13 KiB = 2.97 MiB Load Address: 00700000 Entry Point: 007014a8 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:45:42 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3116528 Bytes = 3043.48 KiB = 2.97 MiB Load Address: 00700000 Entry Point: 007014a8 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:45:42 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3117348 Bytes = 3044.29 KiB = 2.97 MiB Load Address: 00700000 Entry Point: 007014a8 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:45:42 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3116520 Bytes = 3043.48 KiB = 2.97 MiB Load Address: 00700000 Entry Point: 007014a0 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:45:42 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3116555 Bytes = 3043.51 KiB = 2.97 MiB Load Address: 00700000 Entry Point: 00701488 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:45:42 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3117283 Bytes = 3044.22 KiB = 2.97 MiB Load Address: 00700000 Entry Point: 00701498 Image Name: Linux-5.12.0-rc2-gcc7a0bb058b8 Created: Wed Mar 17 16:45:42 2021 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3117318 Bytes = 3044.26 KiB = 2.97 MiB Load Address: 00700000 Entry Point: 007014b8 Completed OK # rm -rf /kisskb/build/powerpc-fixes_ppc44x_defconfig_powerpc-gcc4.9 # Build took: 0:02:00.590619