浏览代码

KVM: Fix compound mmio

mmio_index should be taken into account when copying data from
userspace.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Gleb Natapov 14 年之前
父节点
当前提交
0004c7c257
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      arch/x86/kvm/x86.c

+ 2 - 1
arch/x86/kvm/x86.c

@@ -5576,7 +5576,8 @@ static int complete_mmio(struct kvm_vcpu *vcpu)
 	if (vcpu->mmio_needed) {
 	if (vcpu->mmio_needed) {
 		vcpu->mmio_needed = 0;
 		vcpu->mmio_needed = 0;
 		if (!vcpu->mmio_is_write)
 		if (!vcpu->mmio_is_write)
-			memcpy(vcpu->mmio_data, run->mmio.data, 8);
+			memcpy(vcpu->mmio_data + vcpu->mmio_index,
+			       run->mmio.data, 8);
 		vcpu->mmio_index += 8;
 		vcpu->mmio_index += 8;
 		if (vcpu->mmio_index < vcpu->mmio_size) {
 		if (vcpu->mmio_index < vcpu->mmio_size) {
 			run->exit_reason = KVM_EXIT_MMIO;
 			run->exit_reason = KVM_EXIT_MMIO;