Skip to content

Commit a13bfa4

Browse files
Keir Fraserctmarinas
authored andcommitted
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 2de451a the code in do_el0_mops() was benign as the use of pt_regs_read_reg() prevented the out-of-bounds access. Fixes: 2de451a ("KVM: arm64: Add handler for MOPS exceptions") Cc: <stable@vger.kernel.org> # 6.12.x Cc: Kristina Martsenko <kristina.martsenko@arm.com> Cc: Will Deacon <will@kernel.org> Cc: stable@vger.kernel.org Reviewed-by: Marc Zyngier <maz@kernel.org> Signed-off-by: Keir Fraser <keirf@google.com> Reviewed-by: Kristina Martšenko <kristina.martsenko@arm.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Link: https://lore.kernel.org/r/20250326110448.3792396-1-keirf@google.com Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent 89f43e1 commit a13bfa4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/arm64/include/asm/traps.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,9 @@ static inline void arm64_mops_reset_regs(struct user_pt_regs *regs, unsigned lon
109109
int dstreg = ESR_ELx_MOPS_ISS_DESTREG(esr);
110110
int srcreg = ESR_ELx_MOPS_ISS_SRCREG(esr);
111111
int sizereg = ESR_ELx_MOPS_ISS_SIZEREG(esr);
112-
unsigned long dst, src, size;
112+
unsigned long dst, size;
113113

114114
dst = regs->regs[dstreg];
115-
src = regs->regs[srcreg];
116115
size = regs->regs[sizereg];
117116

118117
/*
@@ -129,6 +128,7 @@ static inline void arm64_mops_reset_regs(struct user_pt_regs *regs, unsigned lon
129128
}
130129
} else {
131130
/* CPY* instruction */
131+
unsigned long src = regs->regs[srcreg];
132132
if (!(option_a ^ wrong_option)) {
133133
/* Format is from Option B */
134134
if (regs->pstate & PSR_N_BIT) {

0 commit comments

Comments
 (0)