# 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-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 19ab500edb5d6020010caba48ce3b4ce4182ab63 # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc44x_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc44x_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc44x_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc44x_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_ppc44x_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/arch/powerpc/boot/dts/katmai.dts:322.26-361.5: Warning (pci_bridge): /plb/pciex@d00000000: node name is not "pci" or "pcie" /kisskb/src/arch/powerpc/boot/dts/katmai.dts:363.26-402.5: Warning (pci_bridge): /plb/pciex@d20000000: node name is not "pci" or "pcie" /kisskb/src/arch/powerpc/boot/dts/katmai.dts:404.26-443.5: Warning (pci_bridge): /plb/pciex@d40000000: node name is not "pci" or "pcie" arch/powerpc/boot/dts/katmai.dtb: Warning (pci_device_bus_num): Failed prerequisite 'pci_bridge' INFO: Uncompressed kernel (size 0x5b95a4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5b95a4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5b95a4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5b95a4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5b95a4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5b95a4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5b95a4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5b95a4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5b95a4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5b95a4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x5b95a4) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 22:21:09 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2931797 Bytes = 2863.08 KiB = 2.80 MiB Load Address: 00600000 Entry Point: 00601514 Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 22:21:10 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2931600 Bytes = 2862.89 KiB = 2.80 MiB Load Address: 00600000 Entry Point: 00601534 Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 22:21:10 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2931631 Bytes = 2862.92 KiB = 2.80 MiB Load Address: 00600000 Entry Point: 00601524 Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 22:21:10 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2931015 Bytes = 2862.32 KiB = 2.80 MiB Load Address: 00600000 Entry Point: 006001b8 Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 22:21:10 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2931729 Bytes = 2863.02 KiB = 2.80 MiB Load Address: 00600000 Entry Point: 006000c4 Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 22:21:10 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2931738 Bytes = 2863.03 KiB = 2.80 MiB Load Address: 00600000 Entry Point: 00601534 Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 22:21:10 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2931831 Bytes = 2863.12 KiB = 2.80 MiB Load Address: 00600000 Entry Point: 0060152c Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 22:21:10 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2931673 Bytes = 2862.96 KiB = 2.80 MiB Load Address: 00600000 Entry Point: 00601544 Image Name: Linux-5.8.0-rc2-g19ab500edb5d Created: Mon Jun 29 22:21:10 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2931757 Bytes = 2863.04 KiB = 2.80 MiB Load Address: 00600000 Entry Point: 00601534 Completed OK # rm -rf /kisskb/build/powerpc-fixes_ppc44x_defconfig_powerpc-gcc5 # Build took: 0:01:08.157068