1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c
index 7513cddb929f..bcf872bdaf74 100644
--- a/drivers/kvm/x86_emulate.c
+++ b/drivers/kvm/x86_emulate.c
@@ -833,8 +833,9 @@ done_prefixes:
                 dst.ptr = (unsigned long *)cr2;
                 dst.bytes = (d & ByteOp) ? 1 : op_bytes;
                 if (d & BitOp) {
-                        dst.ptr += src.val / BITS_PER_LONG;
-                        dst.bytes = sizeof(long);
+                        unsigned long mask = ~(dst.bytes * 8 - 1);
+
+                        dst.ptr = (void *)dst.ptr + (src.val & mask) / 8;
                 }
                 if (!(d & Mov) && /* optimisation - avoid slow emulated read */
                     ((rc = ops->read_emulated((unsigned long)dst.ptr,