# git rev-parse -q --verify 19ab500edb5d6020010caba48ce3b4ce4182ab63^{commit} 19ab500edb5d6020010caba48ce3b4ce4182ab63 already have revision, skipping fetch # git checkout -q -f -B kisskb 19ab500edb5d6020010caba48ce3b4ce4182ab63 # git clean -qxdf # < git log -1 # commit 19ab500edb5d6020010caba48ce3b4ce4182ab63 # Author: Aneesh Kumar K.V # Date: Sat Jun 27 12:31:46 2020 +0530 # # powerpc/mm/pkeys: Make pkey access check work on execute_only_key # # Jan reported that LTP mmap03 was getting stuck in a page fault loop # after commit c46241a370a6 ("powerpc/pkeys: Check vma before returning # key fault error to the user"), as well as a minimised reproducer: # # #include # #include # #include # #include # #include # # int main(int ac, char **av) # { # int page_sz = getpagesize(); # int fildes; # char *addr; # # fildes = open("tempfile", O_WRONLY | O_CREAT, 0666); # write(fildes, &fildes, sizeof(fildes)); # close(fildes); # # fildes = open("tempfile", O_RDONLY); # unlink("tempfile"); # # addr = mmap(0, page_sz, PROT_EXEC, MAP_FILE | MAP_PRIVATE, fildes, 0); # # printf("%d\n", *addr); # return 0; # } # # And noticed that access_pkey_error() in page fault handler now always # seem to return false: # # __do_page_fault # access_pkey_error(is_pkey: 1, is_exec: 0, is_write: 0) # arch_vma_access_permitted # pkey_access_permitted # if (!is_pkey_enabled(pkey)) # return true # return false # # pkey_access_permitted() should not check if the pkey is available in # UAMOR (using is_pkey_enabled()). The kernel needs to do that check # only when allocating keys. This also makes sure the execute_only_key # which is marked as non-manageable via UAMOR is handled correctly in # pkey_access_permitted(), and fixes the bug. # # Fixes: c46241a370a6 ("powerpc/pkeys: Check vma before returning key fault error to the user") # Reported-by: Jan Stancek # Signed-off-by: Aneesh Kumar K.V # [mpe: Include bug report details etc. in the change log] # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/20200627070147.297535-1-aneesh.kumar@linux.ibm.com # < /opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 19ab500edb5d6020010caba48ce3b4ce4182ab63 # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig+KVM_powerpc-gcc9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_defconfig # Added to kconfig CONFIG_PPC_E500MC=y # Added to kconfig CONFIG_VIRTUALIZATION=y # Added to kconfig CONFIG_KVM_E500MC=y # Added to kconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig+KVM_powerpc-gcc9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig+KVM_powerpc-gcc9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:4107:warning: override: reassigning to symbol PPC_E500MC .config:4108:warning: override: reassigning to symbol VIRTUALIZATION # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig+KVM_powerpc-gcc9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-9.2.0-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/kernel.h:11, 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] 22 | #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' 78 | # 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' 139 | 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 0xe95790) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe95790) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe95790) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe95790) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe95790) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe95790) overlaps the address of the wrapper(0x400000) INFO: Uncompressed kernel (size 0xe95790) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe95790) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe95790) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe95790) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe95790) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe95790) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe95790) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe95790) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe95790) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) INFO: Uncompressed kernel (size 0xe84f8c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xf00000) Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 23:22:52 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6782847 Bytes = 6623.87 KiB = 6.47 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 23:22:54 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6817456 Bytes = 6657.67 KiB = 6.50 MiB Load Address: 00f00000 Entry Point: 00f0031c Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 23:22:54 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6817453 Bytes = 6657.67 KiB = 6.50 MiB Load Address: 00f00000 Entry Point: 00f002cc Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 23:22:54 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6817714 Bytes = 6657.92 KiB = 6.50 MiB Load Address: 00f00000 Entry Point: 00f002cc Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 23:22:54 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6817603 Bytes = 6657.82 KiB = 6.50 MiB Load Address: 00f00000 Entry Point: 00f0031c Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 23:22:55 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6817404 Bytes = 6657.62 KiB = 6.50 MiB Load Address: 00f00000 Entry Point: 00f002cc Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 23:22:55 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6817580 Bytes = 6657.79 KiB = 6.50 MiB Load Address: 00f00000 Entry Point: 00f002cc Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 23:22:55 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6817657 Bytes = 6657.87 KiB = 6.50 MiB Load Address: 00f00000 Entry Point: 00f0031c Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 23:22:56 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6818103 Bytes = 6658.30 KiB = 6.50 MiB Load Address: 00f00000 Entry Point: 00f002cc Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 23:22:55 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6818212 Bytes = 6658.41 KiB = 6.50 MiB Load Address: 00f00000 Entry Point: 00f002cc Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 23:22:56 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6817572 Bytes = 6657.79 KiB = 6.50 MiB Load Address: 00f00000 Entry Point: 00f0031c Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 23:22:56 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6817458 Bytes = 6657.67 KiB = 6.50 MiB Load Address: 00f00000 Entry Point: 00f0031c Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 23:22:56 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6818283 Bytes = 6658.48 KiB = 6.50 MiB Load Address: 00f00000 Entry Point: 00f002cc Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 23:22:56 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6818167 Bytes = 6658.37 KiB = 6.50 MiB Load Address: 00f00000 Entry Point: 00f002cc Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 23:22:56 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6817451 Bytes = 6657.67 KiB = 6.50 MiB Load Address: 00f00000 Entry Point: 00f002cc Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 23:22:56 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6817509 Bytes = 6657.72 KiB = 6.50 MiB Load Address: 00f00000 Entry Point: 00f002cc Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_defconfig+KVM_powerpc-gcc9 # Build took: 0:02:53.902882