From: Jan Beulich Date: Wed, 5 Aug 2020 08:19:29 +0000 (+0200) Subject: x86emul: replace further UB shifts X-Git-Tag: 4.15.0-rc1~947 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=21de9680eb594a7038d4d4ed78e53ac90a8c5a6e;p=people%2Fjgross%2Fxen.git x86emul: replace further UB shifts I have no explanation how I managed to overlook these while putting together what is now b6a907f8c83d ("x86emul: replace UB shifts"). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index b8a4a1ca82..10b20cf23b 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -9735,7 +9735,7 @@ x86_emulate( rc = ops->read(ea.mem.seg, truncate_ea(ea.mem.off + - (idx << state->sib_scale)), + idx * (1 << state->sib_scale)), (void *)mmvalp + i * op_bytes, op_bytes, ctxt); if ( rc != X86EMUL_OKAY ) { @@ -9857,7 +9857,8 @@ x86_emulate( continue; rc = ops->read(ea.mem.seg, - truncate_ea(ea.mem.off + (idx << state->sib_scale)), + truncate_ea(ea.mem.off + + idx * (1 << state->sib_scale)), (void *)mmvalp + i * op_bytes, op_bytes, ctxt); if ( rc != X86EMUL_OKAY ) {