diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-09 09:50:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-09 17:07:11 +0100 |
| commit | ca4b2df651a098a716e8cd8ebba79ba329e3dcc3 (patch) | |
| tree | 0aa7f067fef0e7de075e7bd9dce2e81795e93e44 /arch/x86/kvm/emulate.c | |
| parent | 59c6f278bdeea4147e8be92a3ed50a9907e60088 (diff) | |
| parent | b0b6e86846093c5f8820386bc01515f857dd8faa (diff) | |
Merge branch 'x86/urgent' into x86/cpu, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kvm/emulate.c')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 4e95d3eb2955..cbd7b92585bb 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -5045,7 +5045,7 @@ done_prefixes: /* Decode and fetch the destination operand: register or memory. */ rc = decode_operand(ctxt, &ctxt->dst, (ctxt->d >> DstShift) & OpMask); - if (ctxt->rip_relative) + if (ctxt->rip_relative && likely(ctxt->memopp)) ctxt->memopp->addr.mem.ea = address_mask(ctxt, ctxt->memopp->addr.mem.ea + ctxt->_eip); |