forked from Minki/linux
0abdeff598
When refactoring the sigreturn code to handle SVE, I changed the sigreturn implementation to store the new FPSIMD state from the user sigframe into task_struct before reloading the state into the CPU regs. This makes it easier to convert the data for SVE when needed. However, it turns out that the fpsimd_state structure passed into fpsimd_update_current_state is not fully initialised, so assigning the structure as a whole corrupts current->thread.fpsimd_state.cpu with uninitialised data. This means that if the garbage data written to .cpu happens to be a valid cpu number, and the task is subsequently migrated to the cpu identified by the that number, and then tries to enter userspace, the CPU FPSIMD regs will be assumed to be correct for the task and not reloaded as they should be. This can result in returning to userspace with the FPSIMD registers containing data that is stale or that belongs to another task or to the kernel. Knowingly handing around a kernel structure that is incompletely initialised with user data is a potential source of mistakes, especially across source file boundaries. To help avoid a repeat of this issue, this patch adapts the relevant internal API to hand around the user-accessible subset only: struct user_fpsimd_state. To avoid future surprises, this patch also converts all uses of struct fpsimd_state that really only access the user subset, to use struct user_fpsimd_state. A few missing consts are added to function prototypes for good measure. Thanks to Will for spotting the cause of the bug here. Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Dave Martin <Dave.Martin@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
146 lines
4.1 KiB
C
146 lines
4.1 KiB
C
/*
|
|
* Copyright (C) 2012 ARM Ltd.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#ifndef __ASM_FP_H
|
|
#define __ASM_FP_H
|
|
|
|
#include <asm/ptrace.h>
|
|
#include <asm/errno.h>
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#include <linux/cache.h>
|
|
#include <linux/stddef.h>
|
|
|
|
/*
|
|
* FP/SIMD storage area has:
|
|
* - FPSR and FPCR
|
|
* - 32 128-bit data registers
|
|
*
|
|
* Note that user_fpsimd forms a prefix of this structure, which is
|
|
* relied upon in the ptrace FP/SIMD accessors.
|
|
*/
|
|
struct fpsimd_state {
|
|
union {
|
|
struct user_fpsimd_state user_fpsimd;
|
|
struct {
|
|
__uint128_t vregs[32];
|
|
u32 fpsr;
|
|
u32 fpcr;
|
|
/*
|
|
* For ptrace compatibility, pad to next 128-bit
|
|
* boundary here if extending this struct.
|
|
*/
|
|
};
|
|
};
|
|
/* the id of the last cpu to have restored this state */
|
|
unsigned int cpu;
|
|
};
|
|
|
|
#if defined(__KERNEL__) && defined(CONFIG_COMPAT)
|
|
/* Masks for extracting the FPSR and FPCR from the FPSCR */
|
|
#define VFP_FPSCR_STAT_MASK 0xf800009f
|
|
#define VFP_FPSCR_CTRL_MASK 0x07f79f00
|
|
/*
|
|
* The VFP state has 32x64-bit registers and a single 32-bit
|
|
* control/status register.
|
|
*/
|
|
#define VFP_STATE_SIZE ((32 * 8) + 4)
|
|
#endif
|
|
|
|
struct task_struct;
|
|
|
|
extern void fpsimd_save_state(struct fpsimd_state *state);
|
|
extern void fpsimd_load_state(struct fpsimd_state *state);
|
|
|
|
extern void fpsimd_thread_switch(struct task_struct *next);
|
|
extern void fpsimd_flush_thread(void);
|
|
|
|
extern void fpsimd_signal_preserve_current_state(void);
|
|
extern void fpsimd_preserve_current_state(void);
|
|
extern void fpsimd_restore_current_state(void);
|
|
extern void fpsimd_update_current_state(struct user_fpsimd_state const *state);
|
|
|
|
extern void fpsimd_flush_task_state(struct task_struct *target);
|
|
extern void sve_flush_cpu_state(void);
|
|
|
|
/* Maximum VL that SVE VL-agnostic software can transparently support */
|
|
#define SVE_VL_ARCH_MAX 0x100
|
|
|
|
extern void sve_save_state(void *state, u32 *pfpsr);
|
|
extern void sve_load_state(void const *state, u32 const *pfpsr,
|
|
unsigned long vq_minus_1);
|
|
extern unsigned int sve_get_vl(void);
|
|
extern int sve_kernel_enable(void *);
|
|
|
|
extern int __ro_after_init sve_max_vl;
|
|
|
|
#ifdef CONFIG_ARM64_SVE
|
|
|
|
extern size_t sve_state_size(struct task_struct const *task);
|
|
|
|
extern void sve_alloc(struct task_struct *task);
|
|
extern void fpsimd_release_task(struct task_struct *task);
|
|
extern void fpsimd_sync_to_sve(struct task_struct *task);
|
|
extern void sve_sync_to_fpsimd(struct task_struct *task);
|
|
extern void sve_sync_from_fpsimd_zeropad(struct task_struct *task);
|
|
|
|
extern int sve_set_vector_length(struct task_struct *task,
|
|
unsigned long vl, unsigned long flags);
|
|
|
|
extern int sve_set_current_vl(unsigned long arg);
|
|
extern int sve_get_current_vl(void);
|
|
|
|
/*
|
|
* Probing and setup functions.
|
|
* Calls to these functions must be serialised with one another.
|
|
*/
|
|
extern void __init sve_init_vq_map(void);
|
|
extern void sve_update_vq_map(void);
|
|
extern int sve_verify_vq_map(void);
|
|
extern void __init sve_setup(void);
|
|
|
|
#else /* ! CONFIG_ARM64_SVE */
|
|
|
|
static inline void sve_alloc(struct task_struct *task) { }
|
|
static inline void fpsimd_release_task(struct task_struct *task) { }
|
|
static inline void sve_sync_to_fpsimd(struct task_struct *task) { }
|
|
static inline void sve_sync_from_fpsimd_zeropad(struct task_struct *task) { }
|
|
|
|
static inline int sve_set_current_vl(unsigned long arg)
|
|
{
|
|
return -EINVAL;
|
|
}
|
|
|
|
static inline int sve_get_current_vl(void)
|
|
{
|
|
return -EINVAL;
|
|
}
|
|
|
|
static inline void sve_init_vq_map(void) { }
|
|
static inline void sve_update_vq_map(void) { }
|
|
static inline int sve_verify_vq_map(void) { return 0; }
|
|
static inline void sve_setup(void) { }
|
|
|
|
#endif /* ! CONFIG_ARM64_SVE */
|
|
|
|
/* For use by EFI runtime services calls only */
|
|
extern void __efi_fpsimd_begin(void);
|
|
extern void __efi_fpsimd_end(void);
|
|
|
|
#endif
|
|
|
|
#endif
|