# git rev-parse -q --verify 4a7aee96200ad281a5cc4cf5c7a2e2a49d2b97b0^{commit} 4a7aee96200ad281a5cc4cf5c7a2e2a49d2b97b0 already have revision, skipping fetch # git checkout -q -f -B kisskb 4a7aee96200ad281a5cc4cf5c7a2e2a49d2b97b0 # git clean -qxdf # < git log -1 # commit 4a7aee96200ad281a5cc4cf5c7a2e2a49d2b97b0 # Author: Jiangfeng Xiao # Date: Tue Jan 23 09:45:59 2024 +0800 # # powerpc/kasan: Fix addr error caused by page alignment # # In kasan_init_region, when k_start is not page aligned, at the begin of # for loop, k_cur = k_start & PAGE_MASK is less than k_start, and then # `va = block + k_cur - k_start` is less than block, the addr va is invalid, # because the memory address space from va to block is not alloced by # memblock_alloc, which will not be reserved by memblock_reserve later, it # will be used by other places. # # As a result, memory overwriting occurs. # # for example: # int __init __weak kasan_init_region(void *start, size_t size) # { # [...] # /* if say block(dcd97000) k_start(feef7400) k_end(feeff3fe) */ # block = memblock_alloc(k_end - k_start, PAGE_SIZE); # [...] # for (k_cur = k_start & PAGE_MASK; k_cur < k_end; k_cur += PAGE_SIZE) { # /* at the begin of for loop # * block(dcd97000) va(dcd96c00) k_cur(feef7000) k_start(feef7400) # * va(dcd96c00) is less than block(dcd97000), va is invalid # */ # void *va = block + k_cur - k_start; # [...] # } # [...] # } # # Therefore, page alignment is performed on k_start before # memblock_alloc() to ensure the validity of the VA address. # # Fixes: 663c0c9496a6 ("powerpc/kasan: Fix shadow area set up for modules.") # Signed-off-by: Jiangfeng Xiao # Signed-off-by: Michael Ellerman # Link: https://msgid.link/1705974359-43790-1-git-send-email-xiaojiangfeng@huawei.com # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 4a7aee96200ad281a5cc4cf5c7a2e2a49d2b97b0 # make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pseries_defconfig+NO_SPLPAR_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- pseries_defconfig Using /kisskb/src/arch/powerpc/configs/ppc64_defconfig as base Merging /kisskb/src/arch/powerpc/configs/le.config Merging /kisskb/src/arch/powerpc/configs/guest.config Value of CONFIG_VIRTIO_BLK is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_BLK=m New value: CONFIG_VIRTIO_BLK=y Value of CONFIG_SCSI_VIRTIO is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_SCSI_VIRTIO=m New value: CONFIG_SCSI_VIRTIO=y Value of CONFIG_VIRTIO_NET is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_NET=m New value: CONFIG_VIRTIO_NET=y Value of CONFIG_VIRTIO_CONSOLE is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_CONSOLE=m New value: CONFIG_VIRTIO_CONSOLE=y Value of CONFIG_VIRTIO_PCI is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_PCI=m New value: CONFIG_VIRTIO_PCI=y Value of CONFIG_VIRTIO_BALLOON is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VIRTIO_BALLOON=m New value: CONFIG_VIRTIO_BALLOON=y Value of CONFIG_VHOST_NET is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_VHOST_NET=m New value: CONFIG_VHOST_NET=y Value of CONFIG_IBMVETH is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_IBMVETH=m New value: CONFIG_IBMVETH=y Value of CONFIG_IBMVNIC is redefined by fragment /kisskb/src/arch/powerpc/configs/guest.config: Previous value: CONFIG_IBMVNIC=m New value: CONFIG_IBMVNIC=y Merging /kisskb/src/arch/powerpc/configs/kvm_guest.config # # merged configuration written to .config (needs make) # # Added to kconfig CONFIG_PPC_SPLPAR=n # < make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pseries_defconfig+NO_SPLPAR_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pseries_defconfig+NO_SPLPAR_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pseries_defconfig+NO_SPLPAR_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/powerpc-fixes_pseries_defconfig+NO_SPLPAR_powerpc-gcc5 # Build took: 0:06:09.249345