# git rev-parse -q --verify 9e049ef80be988e91cb55f3ddfa7c80a7b376852^{commit} 9e049ef80be988e91cb55f3ddfa7c80a7b376852 already have revision, skipping fetch # git checkout -q -f -B kisskb 9e049ef80be988e91cb55f3ddfa7c80a7b376852 # git clean -qxdf # < git log -1 # commit 9e049ef80be988e91cb55f3ddfa7c80a7b376852 # Author: Alexey Kardashevskiy # Date: Thu Jul 5 18:01:33 2018 +1000 # # KVM: PPC: Check if IOMMU page is contained in the pinned physical page # # A VM which has: # - a DMA capable device passed through to it (eg. network card); # - running a malicious kernel that ignores H_PUT_TCE failure; # - capability of using IOMMU pages bigger that physical pages # can create an IOMMU mapping that exposes (for example) 16MB of # the host physical memory to the device when only 64K was allocated to # the VM. # # The remaining 16MB - 64K will be some other content of host memory, # possibly including pages of the VM, but also pages of host kernel memory, # host programs or other VMs. # # The attacking VM does not control the location of the page it can map, # and is only allowed to map as many pages as it has pages of RAM. # # We already have a check in drivers/vfio/vfio_iommu_spapr_tce.c that # an IOMMU page is contained in the physical page so the PCI hardware won't # get access to unassigned host memory; however this check is missing in # the KVM fastpath (H_PUT_TCE accelerated code). We were lucky so far and # did not hit this yet as the very first time when the mapping happens # we do not have tbl::it_userspace allocated yet and fall back to # the userspace which in turn calls VFIO IOMMU driver, this fails and # the guest does not retry, # # This stores the smallest preregistered page size in the preregistered # region descriptor and changes the mm_iommu_xxx API to check this against # the IOMMU page size. This calculates maximum page size as a minimum of # the natural region alignment and compound page size. # # Signed-off-by: Alexey Kardashevskiy # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < git log --format=%s --max-count=1 9e049ef80be988e91cb55f3ddfa7c80a7b376852 # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_smp_defconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/net/Makefile:24: CC cannot link executables. Skipping bpfilter. /kisskb/src/net/Makefile:24: CC cannot link executables. Skipping bpfilter. 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:9, 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:77: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)) ^ arch/powerpc/boot/mpc8555cds.dtb: Warning (pci_device_bus_num): /pci@e0008000/i8259@19000:bus-range: PCI bus number 1 out of range, expected (0 - 0) arch/powerpc/boot/mpc8541cds.dtb: 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 0xbf36e4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf36e4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf36e4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf36e4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf36e4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf36e4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf36e4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf36e4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf36e4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf36e4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf36e4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf36e4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf36e4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf36e4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbf36e4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xbe2f2c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) Image Name: Linux-4.18.0-rc3-g9e049ef Created: Fri Jul 6 11:12:47 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5895009 Bytes = 5756.84 kB = 5.62 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g9e049ef Created: Fri Jul 6 11:12:48 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5896725 Bytes = 5758.52 kB = 5.62 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g9e049ef Created: Fri Jul 6 11:12:48 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5871628 Bytes = 5734.01 kB = 5.60 MB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-4.18.0-rc3-g9e049ef Created: Fri Jul 6 11:12:48 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5895134 Bytes = 5756.97 kB = 5.62 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g9e049ef Created: Fri Jul 6 11:12:48 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5895087 Bytes = 5756.92 kB = 5.62 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.18.0-rc3-g9e049ef Created: Fri Jul 6 11:12:48 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5896427 Bytes = 5758.23 kB = 5.62 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g9e049ef Created: Fri Jul 6 11:12:48 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5895016 Bytes = 5756.85 kB = 5.62 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g9e049ef Created: Fri Jul 6 11:12:48 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5895086 Bytes = 5756.92 kB = 5.62 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.18.0-rc3-g9e049ef Created: Fri Jul 6 11:12:48 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5896515 Bytes = 5758.32 kB = 5.62 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g9e049ef Created: Fri Jul 6 11:12:49 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5895356 Bytes = 5757.18 kB = 5.62 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g9e049ef Created: Fri Jul 6 11:12:48 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5895194 Bytes = 5757.03 kB = 5.62 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g9e049ef Created: Fri Jul 6 11:12:48 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5895262 Bytes = 5757.09 kB = 5.62 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.18.0-rc3-g9e049ef Created: Fri Jul 6 11:12:49 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5895042 Bytes = 5756.88 kB = 5.62 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.18.0-rc3-g9e049ef Created: Fri Jul 6 11:12:49 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5895054 Bytes = 5756.89 kB = 5.62 MB Load Address: 00c00000 Entry Point: 00c00278 Image Name: Linux-4.18.0-rc3-g9e049ef Created: Fri Jul 6 11:12:49 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5895209 Bytes = 5757.04 kB = 5.62 MB Load Address: 00c00000 Entry Point: 00c0020c Image Name: Linux-4.18.0-rc3-g9e049ef Created: Fri Jul 6 11:12:49 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5896726 Bytes = 5758.52 kB = 5.62 MB Load Address: 00c00000 Entry Point: 00c0020c Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_smp_defconfig_powerpc-5.3 # Build took: 0:01:49.780614