Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit fe9b842f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Palmer Dabbelt
Browse files

riscv: disable SUM in the exception handler



The SUM bit is enabled at the beginning of the copy_{to,from}_user and
{get,put}_user routines, and cleared before they return.  But these user
copy helper can be interrupted by exceptions, in which case the SUM bit
will remain set, which leads to elevated privileges for the code running
in exception context, as that can now access userspace address space
unconditionally.  This frequently happens when the user copy routines
access freshly allocated user memory that hasn't been faulted in, and a
pagefault needs to be taken before the user copy routines can continue.

Fix this by unconditionally clearing SUM when the exception handler is
called - the restore code will automatically restore it based on the
saved value.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarPalmer Dabbelt <palmer@sifive.com>
parent 509009cc
Loading
Loading
Loading
Loading
+6 −3
Original line number Original line Diff line number Diff line
@@ -78,10 +78,13 @@ _save_context:
	REG_S x31, PT_T6(sp)
	REG_S x31, PT_T6(sp)


	/*
	/*
	 * Disable FPU to detect illegal usage of
	 * Disable user-mode memory access as it should only be set in the
	 * floating point in kernel space
	 * actual user copy routines.
	 *
	 * Disable the FPU to detect illegal usage of floating point in kernel
	 * space.
	 */
	 */
	li t0, SR_FS
	li t0, SR_SUM | SR_FS


	REG_L s0, TASK_TI_USER_SP(tp)
	REG_L s0, TASK_TI_USER_SP(tp)
	csrrc s1, sstatus, t0
	csrrc s1, sstatus, t0