arm64: mops: Do not dereference src reg for a set operation
Subsystems (2)
PATCH v2 1/1 arm64: mops: Do not dereference src reg for a set operation
The source register is not used for SET* and reading it can result in a UBSAN out-of-bounds array access error, specifically when the MOPS exception is taken from a SET* sequence with XZR (reg 31) as the source. Architecturally this is the only case where a src/dst/size field in the ESR can be reported as 31.
Prior to 2de451a329cf662b the code in do_el0_mops() was benign as the use of pt_regs_read_reg() prevented the out-of-bounds access.
--- arch/arm64/include/asm/traps.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/include/asm/traps.h +2 -2
@@ -109,10 +109,9 @@ static inline void arm64_mops_reset_regs(struct user_pt_regs *regs, unsigned lonint dstreg =ESR_ELx_MOPS_ISS_DESTREG (esr);int srcreg =ESR_ELx_MOPS_ISS_SRCREG (esr);int sizereg =ESR_ELx_MOPS_ISS_SIZEREG (esr); -unsigned long dst, src, size; +unsigned long dst, size; dst = regs->regs[dstreg]; - src = regs->regs[srcreg]; size = regs->regs[sizereg];/*
@@ -129,6 +128,7 @@ static inline void arm64_mops_reset_regs(struct user_pt_regs *regs, unsigned lon } }else {/* CPY* instruction */ +unsigned long src = regs->regs[srcreg];if (!(option_a ^ wrong_option)) {/* Format is from Option B */ if (regs->pstate &PSR_N_BIT ) {
Signature · 1 line
2.49.0.395.g12beb8f557-goog
Quoted 9 lines · Keir Fraser
The source register is not used for SET* and reading it can result in a UBSAN out-of-bounds array access error, specifically when the MOPS exception is taken from a SET* sequence with XZR (reg 31) as the source. Architecturally this is the only case where a src/dst/size field in the ESR can be reported as 31.
Prior to
2de451a329cf662bthe code indo_el0_mops()was benign as the use ofpt_regs_read_reg()prevented the out-of-bounds access.
Quoted 8 lines
Fixes 2de451a329cf662b ("KVM: arm64: Add handler for MOPS exceptions")Cc Kristina Martsenko <[email protected]>Cc Catalin Marinas <[email protected]>Cc Mark Rutland <[email protected]>Cc Will Deacon <[email protected]>Reviewed-by Marc Zyngier <[email protected]>Signed-off-by Keir Fraser <[email protected]>
FWIW,
Thanks,
Kristina
Quoted 10 lines · Keir Fraser
The source register is not used for SET* and reading it can result in a UBSAN out-of-bounds array access error, specifically when the MOPS exception is taken from a SET* sequence with XZR (reg 31) as the source. Architecturally this is the only case where a src/dst/size field in the ESR can be reported as 31.
Prior to
2de451a329cf662bthe code indo_el0_mops()was benign as the use ofpt_regs_read_reg()prevented the out-of-bounds access.[...]
Applied to arm64 (for-next/core), thanks!
[1/1] arm64: mops: Do not dereference src reg for a set operation
https://git.kernel.org/arm64/c/a13bfa4fe0d6
Signature · 1 line
Catalin