diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-30 08:29:30 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-30 08:29:30 +0100 |
commit | ebad43260d225bccd57c7144a6eecbef3cd88f7f (patch) | |
tree | c4c83645b5226982ddf26616e5e2ade2e26147b9 /arch/x86/kvm/svm/svm.c | |
parent | ab37fa851c488be805f6568ecaabb67b13cd937c (diff) | |
parent | b65054597872ce3aefbc6a666385eabdf9e288da (diff) | |
download | linux-stable-ebad43260d225bccd57c7144a6eecbef3cd88f7f.tar.gz linux-stable-ebad43260d225bccd57c7144a6eecbef3cd88f7f.tar.bz2 linux-stable-ebad43260d225bccd57c7144a6eecbef3cd88f7f.zip |
Merge 5.10-rc6 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kvm/svm/svm.c')
-rw-r--r-- | arch/x86/kvm/svm/svm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 1e81cfebd491..79b3a564f1c9 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -1309,8 +1309,10 @@ static int svm_create_vcpu(struct kvm_vcpu *vcpu) svm->avic_is_running = true; svm->msrpm = svm_vcpu_alloc_msrpm(); - if (!svm->msrpm) + if (!svm->msrpm) { + err = -ENOMEM; goto error_free_vmcb_page; + } svm_vcpu_init_msrpm(vcpu, svm->msrpm); |