]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
x86/fault: Fix wrong signal when vsyscall fails with pkey
authorJiashuo Liang <liangjs@pku.edu.cn>
Fri, 30 Jul 2021 03:01:52 +0000 (11:01 +0800)
committerBorislav Petkov <bp@suse.de>
Mon, 20 Sep 2021 20:28:47 +0000 (22:28 +0200)
commitd4ffd5df9d18031b6a53f934388726775b4452d3
tree8dc52665b1a5b1bba9e37d1baa773e7a30d7cd2c
parente4e737bb5c170df6135a127739a9e6148ee3da82
x86/fault: Fix wrong signal when vsyscall fails with pkey

The function __bad_area_nosemaphore() calls kernelmode_fixup_or_oops()
with the parameter @signal being actually @pkey, which will send a
signal numbered with the argument in @pkey.

This bug can be triggered when the kernel fails to access user-given
memory pages that are protected by a pkey, so it can go down the
do_user_addr_fault() path and pass the !user_mode() check in
__bad_area_nosemaphore().

Most cases will simply run the kernel fixup code to make an -EFAULT. But
when another condition current->thread.sig_on_uaccess_err is met, which
is only used to emulate vsyscall, the kernel will generate the wrong
signal.

Add a new parameter @pkey to kernelmode_fixup_or_oops() to fix this.

 [ bp: Massage commit message, fix build error as reported by the 0day
   bot: https://lkml.kernel.org/r/202109202245.APvuT8BX-lkp@intel.com ]

Fixes: 5042d40a264c ("x86/fault: Bypass no_context() for implicit kernel faults from usermode")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Jiashuo Liang <liangjs@pku.edu.cn>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lkml.kernel.org/r/20210730030152.249106-1-liangjs@pku.edu.cn
arch/x86/include/asm/pkeys.h
arch/x86/mm/fault.c
include/linux/pkeys.h