625c3ed247
commit 95bf9d646c3c3f95cb0be7e703b371db8da5be68 upstream. When an instruction to save or restore a register from the stack fails in _save_fp_context or _restore_fp_context return with -EFAULT. This change was made to r2300_fpu.S[1] but it looks like it got lost with the introduction of EX2[2]. This is also what the other implementation of _save_fp_context and _restore_fp_context in r4k_fpu.S does, and what is needed for the callers to be able to handle the error. Furthermore calling do_exit(SIGSEGV) from bad_stack is wrong because it does not terminate the entire process it just terminates a single thread. As the changed code was the only caller of arch/mips/kernel/syscall.c:bad_stack remove the problematic and now unused helper function. Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Maciej Rozycki <macro@orcam.me.uk> Cc: linux-mips@vger.kernel.org [1]35938a00ba
("MIPS: Fix ISA I FP sigcontext access violation handling") [2]f92722dc45
("MIPS: Correct MIPS I FP sigcontext layout") Cc: stable@vger.kernel.org Fixes:f92722dc45
("MIPS: Correct MIPS I FP sigcontext layout") Acked-by: Maciej W. Rozycki <macro@orcam.me.uk> Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Link: https://lkml.kernel.org/r/20211020174406.17889-5-ebiederm@xmission.com Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
131 lines
2.8 KiB
ArmAsm
131 lines
2.8 KiB
ArmAsm
/*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Copyright (C) 1996, 1998 by Ralf Baechle
|
|
*
|
|
* Multi-arch abstraction and asm macros for easier reading:
|
|
* Copyright (C) 1996 David S. Miller (davem@davemloft.net)
|
|
*
|
|
* Further modifications to make this work:
|
|
* Copyright (c) 1998 Harald Koerfgen
|
|
*/
|
|
#include <asm/asm.h>
|
|
#include <asm/asmmacro.h>
|
|
#include <asm/errno.h>
|
|
#include <asm/export.h>
|
|
#include <asm/fpregdef.h>
|
|
#include <asm/mipsregs.h>
|
|
#include <asm/asm-offsets.h>
|
|
#include <asm/regdef.h>
|
|
|
|
#define EX(a,b) \
|
|
9: a,##b; \
|
|
.section __ex_table,"a"; \
|
|
PTR 9b,fault; \
|
|
.previous
|
|
|
|
#define EX2(a,b) \
|
|
9: a,##b; \
|
|
.section __ex_table,"a"; \
|
|
PTR 9b,fault; \
|
|
PTR 9b+4,fault; \
|
|
.previous
|
|
|
|
.set mips1
|
|
|
|
/*
|
|
* Save a thread's fp context.
|
|
*/
|
|
LEAF(_save_fp)
|
|
EXPORT_SYMBOL(_save_fp)
|
|
fpu_save_single a0, t1 # clobbers t1
|
|
jr ra
|
|
END(_save_fp)
|
|
|
|
/*
|
|
* Restore a thread's fp context.
|
|
*/
|
|
LEAF(_restore_fp)
|
|
fpu_restore_single a0, t1 # clobbers t1
|
|
jr ra
|
|
END(_restore_fp)
|
|
|
|
.set noreorder
|
|
|
|
/**
|
|
* _save_fp_context() - save FP context from the FPU
|
|
* @a0 - pointer to fpregs field of sigcontext
|
|
* @a1 - pointer to fpc_csr field of sigcontext
|
|
*
|
|
* Save FP context, including the 32 FP data registers and the FP
|
|
* control & status register, from the FPU to signal context.
|
|
*/
|
|
LEAF(_save_fp_context)
|
|
.set push
|
|
SET_HARDFLOAT
|
|
li v0, 0 # assume success
|
|
cfc1 t1, fcr31
|
|
EX2(s.d $f0, 0(a0))
|
|
EX2(s.d $f2, 16(a0))
|
|
EX2(s.d $f4, 32(a0))
|
|
EX2(s.d $f6, 48(a0))
|
|
EX2(s.d $f8, 64(a0))
|
|
EX2(s.d $f10, 80(a0))
|
|
EX2(s.d $f12, 96(a0))
|
|
EX2(s.d $f14, 112(a0))
|
|
EX2(s.d $f16, 128(a0))
|
|
EX2(s.d $f18, 144(a0))
|
|
EX2(s.d $f20, 160(a0))
|
|
EX2(s.d $f22, 176(a0))
|
|
EX2(s.d $f24, 192(a0))
|
|
EX2(s.d $f26, 208(a0))
|
|
EX2(s.d $f28, 224(a0))
|
|
EX2(s.d $f30, 240(a0))
|
|
jr ra
|
|
EX(sw t1, (a1))
|
|
.set pop
|
|
END(_save_fp_context)
|
|
|
|
/**
|
|
* _restore_fp_context() - restore FP context to the FPU
|
|
* @a0 - pointer to fpregs field of sigcontext
|
|
* @a1 - pointer to fpc_csr field of sigcontext
|
|
*
|
|
* Restore FP context, including the 32 FP data registers and the FP
|
|
* control & status register, from signal context to the FPU.
|
|
*/
|
|
LEAF(_restore_fp_context)
|
|
.set push
|
|
SET_HARDFLOAT
|
|
li v0, 0 # assume success
|
|
EX(lw t0, (a1))
|
|
EX2(l.d $f0, 0(a0))
|
|
EX2(l.d $f2, 16(a0))
|
|
EX2(l.d $f4, 32(a0))
|
|
EX2(l.d $f6, 48(a0))
|
|
EX2(l.d $f8, 64(a0))
|
|
EX2(l.d $f10, 80(a0))
|
|
EX2(l.d $f12, 96(a0))
|
|
EX2(l.d $f14, 112(a0))
|
|
EX2(l.d $f16, 128(a0))
|
|
EX2(l.d $f18, 144(a0))
|
|
EX2(l.d $f20, 160(a0))
|
|
EX2(l.d $f22, 176(a0))
|
|
EX2(l.d $f24, 192(a0))
|
|
EX2(l.d $f26, 208(a0))
|
|
EX2(l.d $f28, 224(a0))
|
|
EX2(l.d $f30, 240(a0))
|
|
jr ra
|
|
ctc1 t0, fcr31
|
|
.set pop
|
|
END(_restore_fp_context)
|
|
.set reorder
|
|
|
|
.type fault, @function
|
|
.ent fault
|
|
fault: li v0, -EFAULT
|
|
jr ra
|
|
.end fault
|