# 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-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 19ab500edb5d6020010caba48ce3b4ce4182ab63 # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-fixes_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/kernel.h:11:0, 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] #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' # 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)) ^ /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 0xcc7628) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcc7628) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcc7628) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcc7628) overlaps the address of the wrapper(0x400000) INFO: Uncompressed kernel (size 0xcc7628) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcc7628) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcc7628) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcc7628) overlaps the address of the wrapper(0x400000) INFO: Uncompressed kernel (size 0xcc7628) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcc7628) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcc7628) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcc7628) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcc7628) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcc7628) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcc7628) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) INFO: Uncompressed kernel (size 0xcb6e24) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xd00000) Image Name: Linux-5.8.0-rc2-31860-g19ab500ed Created: Tue Jun 30 00:20:57 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6261656 Bytes = 6114.90 KiB = 5.97 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc2-31860-g19ab500ed Created: Tue Jun 30 00:20:59 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6261484 Bytes = 6114.73 KiB = 5.97 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.8.0-rc2-31860-g19ab500ed Created: Tue Jun 30 00:20:59 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6260088 Bytes = 6113.37 KiB = 5.97 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.8.0-rc2-31860-g19ab500ed Created: Tue Jun 30 00:20:59 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6260083 Bytes = 6113.36 KiB = 5.97 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc2-31860-g19ab500ed Created: Tue Jun 30 00:20:59 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6260066 Bytes = 6113.35 KiB = 5.97 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc2-31860-g19ab500ed Created: Tue Jun 30 00:20:58 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6260036 Bytes = 6113.32 KiB = 5.97 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.8.0-rc2-31860-g19ab500ed Created: Tue Jun 30 00:20:58 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6260095 Bytes = 6113.37 KiB = 5.97 MiB Load Address: 00d00000 Entry Point: 00d00314 Image Name: Linux-5.8.0-rc2-31860-g19ab500ed Created: Tue Jun 30 00:20:58 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6226874 Bytes = 6080.93 KiB = 5.94 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.8.0-rc2-31860-g19ab500ed Created: Tue Jun 30 00:21:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6261484 Bytes = 6114.73 KiB = 5.97 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc2-31860-g19ab500ed Created: Tue Jun 30 00:21:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6261423 Bytes = 6114.67 KiB = 5.97 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc2-31860-g19ab500ed Created: Tue Jun 30 00:21:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6260081 Bytes = 6113.36 KiB = 5.97 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc2-31860-g19ab500ed Created: Tue Jun 30 00:21:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6261700 Bytes = 6114.94 KiB = 5.97 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc2-31860-g19ab500ed Created: Tue Jun 30 00:21:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6261421 Bytes = 6114.67 KiB = 5.97 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc2-31860-g19ab500ed Created: Tue Jun 30 00:21:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6260110 Bytes = 6113.39 KiB = 5.97 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc2-31860-g19ab500ed Created: Tue Jun 30 00:21:00 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6261663 Bytes = 6114.91 KiB = 5.97 MiB Load Address: 00d00000 Entry Point: 00d002a4 Image Name: Linux-5.8.0-rc2-31860-g19ab500ed Created: Tue Jun 30 00:21:01 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 6261486 Bytes = 6114.73 KiB = 5.97 MiB Load Address: 00d00000 Entry Point: 00d00314 Completed OK # rm -rf /kisskb/build/powerpc-fixes_mpc85xx_defconfig_powerpc-gcc4.9 # Build took: 0:02:05.139178