Commit 1691521e authored by Andrei Vagin's avatar Andrei Vagin Committed by liwei
Browse files

x86/fpu: Stop relying on userspace for info to fault in xsave buffer

mainline inclusion
from mainline-v6.8-rc4
commit d877550eaf2dc9090d782864c96939397a3c6835
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I93HD8
CVE: CVE-2024-26603

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d877550eaf2dc9090d782864c96939397a3c6835



--------------------------------

Before this change, the expected size of the user space buffer was
taken from fx_sw->xstate_size. fx_sw->xstate_size can be changed
from user-space, so it is possible construct a sigreturn frame where:

 * fx_sw->xstate_size is smaller than the size required by valid bits in
   fx_sw->xfeatures.
 * user-space unmaps parts of the sigrame fpu buffer so that not all of
   the buffer required by xrstor is accessible.

In this case, xrstor tries to restore and accesses the unmapped area
which results in a fault. But fault_in_readable succeeds because buf +
fx_sw->xstate_size is within the still mapped area, so it goes back and
tries xrstor again. It will spin in this loop forever.

Instead, fault in the maximum size which can be touched by XRSTOR (taken
from fpstate->user_size).

[ dhansen: tweak subject / changelog ]

Fixes: fcb3635f ("x86/fpu/signal: Handle #PF in the direct restore path")
Reported-by: default avatarKonstantin Bogomolov <bogomolov@google.com>
Suggested-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrei Vagin <avagin@google.com>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Cc:stable@vger.kernel.org
Link: https://lore.kernel.org/all/20240130063603.3392627-1-avagin%40google.com



Conflicts:
	arch/x86/kernel/fpu/signal.c
Signed-off-by: default avatarliwei <liwei728@huawei.com>
parent 87e496fb
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment