Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor overlapping changes in the btusb and ixgbe drivers.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index ced9fba32598..a3cba321b5c5 100644
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -4540,6 +4540,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu)
         int len;
         gva_t gva = 0;
         struct vmcs12 *vmcs12;
+        struct x86_exception e;
         short offset;
 
         if (!nested_vmx_check_permission(vcpu))
@@ -4588,7 +4589,8 @@ static int handle_vmread(struct kvm_vcpu *vcpu)
                                 vmx_instruction_info, true, len, &gva))
                         return 1;
                 /* _system ok, nested_vmx_check_permission has verified cpl=0 */
-                kvm_write_guest_virt_system(vcpu, gva, &field_value, len, NULL);
+                if (kvm_write_guest_virt_system(vcpu, gva, &field_value, len, &e))
+                        kvm_inject_page_fault(vcpu, &e);
         }
 
         return nested_vmx_succeed(vcpu);