* [PATCH][next] KVM: SVM: nested: fix free of uninitialized pointers save and ctl
@ 2020-09-11 11:07 Colin King
2020-09-11 11:49 ` Vitaly Kuznetsov
0 siblings, 1 reply; 3+ messages in thread
From: Colin King @ 2020-09-11 11:07 UTC (permalink / raw)
To: Paolo Bonzini, Sean Christopherson, Vitaly Kuznetsov, Wanpeng Li,
Jim Mattson, Joerg Roedel, Thomas Gleixner, Ingo Molnar,
Borislav Petkov, maintainer:X86 ARCHITECTURE, H . Peter Anvin,
kvm
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Currently the error exit path to outt_set_gif will kfree on uninitialized
pointers save and ctl. Fix this by ensuring these pointers are
inintialized to NULL to avoid garbage pointer freeing.
Addresses-Coverity: ("Uninitialized pointer read")
Fixes: 6ccbd29ade0d ("KVM: SVM: nested: Don't allocate VMCB structures on stack")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
arch/x86/kvm/svm/nested.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
index 28036629abf8..2b15f49f9e5a 100644
--- a/arch/x86/kvm/svm/nested.c
+++ b/arch/x86/kvm/svm/nested.c
@@ -1060,8 +1060,8 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,
struct vmcb *hsave = svm->nested.hsave;
struct vmcb __user *user_vmcb = (struct vmcb __user *)
&user_kvm_nested_state->data.svm[0];
- struct vmcb_control_area *ctl;
- struct vmcb_save_area *save;
+ struct vmcb_control_area *ctl = NULL;
+ struct vmcb_save_area *save = NULL;
int ret;
u32 cr0;
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH][next] KVM: SVM: nested: fix free of uninitialized pointers save and ctl
2020-09-11 11:07 [PATCH][next] KVM: SVM: nested: fix free of uninitialized pointers save and ctl Colin King
@ 2020-09-11 11:49 ` Vitaly Kuznetsov
2020-09-11 16:28 ` Sean Christopherson
0 siblings, 1 reply; 3+ messages in thread
From: Vitaly Kuznetsov @ 2020-09-11 11:49 UTC (permalink / raw)
To: Colin King
Cc: kernel-janitors, linux-kernel, Paolo Bonzini,
Sean Christopherson, Wanpeng Li, Jim Mattson, Joerg Roedel,
Thomas Gleixner, Ingo Molnar, Borislav Petkov,
maintainer:X86 ARCHITECTURE, H . Peter Anvin, kvm
Colin King <colin.king@canonical.com> writes:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently the error exit path to outt_set_gif will kfree on
> uninitialized
typo: out_set_gif
> pointers save and ctl. Fix this by ensuring these pointers are
> inintialized to NULL to avoid garbage pointer freeing.
>
> Addresses-Coverity: ("Uninitialized pointer read")
> Fixes: 6ccbd29ade0d ("KVM: SVM: nested: Don't allocate VMCB structures
> on stack")
Where is this commit id from? I don't see it in Paolo's kvm tree, if
it's not yet merged, maybe we should fix it and avoid introducing the
issue in the first place?
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> arch/x86/kvm/svm/nested.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
> index 28036629abf8..2b15f49f9e5a 100644
> --- a/arch/x86/kvm/svm/nested.c
> +++ b/arch/x86/kvm/svm/nested.c
> @@ -1060,8 +1060,8 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,
> struct vmcb *hsave = svm->nested.hsave;
> struct vmcb __user *user_vmcb = (struct vmcb __user *)
> &user_kvm_nested_state->data.svm[0];
> - struct vmcb_control_area *ctl;
> - struct vmcb_save_area *save;
> + struct vmcb_control_area *ctl = NULL;
> + struct vmcb_save_area *save = NULL;
> int ret;
> u32 cr0;
I think it would be better if we eliminate 'out_set_gif; completely as
the 'error path' we have looks a bit weird anyway. Something like
(untested):
diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
index 28036629abf8..d1ae94f40907 100644
--- a/arch/x86/kvm/svm/nested.c
+++ b/arch/x86/kvm/svm/nested.c
@@ -1092,7 +1092,8 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,
if (!(kvm_state->flags & KVM_STATE_NESTED_GUEST_MODE)) {
svm_leave_nested(svm);
- goto out_set_gif;
+ svm_set_gif(svm, !!(kvm_state->flags & KVM_STATE_NESTED_GIF_SET));
+ return 0;
}
if (!page_address_valid(vcpu, kvm_state->hdr.svm.vmcb_pa))
@@ -1145,7 +1146,6 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,
load_nested_vmcb_control(svm, ctl);
nested_prepare_vmcb_control(svm);
-out_set_gif:
svm_set_gif(svm, !!(kvm_state->flags & KVM_STATE_NESTED_GIF_SET));
ret = 0;
--
Vitaly
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH][next] KVM: SVM: nested: fix free of uninitialized pointers save and ctl
2020-09-11 11:49 ` Vitaly Kuznetsov
@ 2020-09-11 16:28 ` Sean Christopherson
0 siblings, 0 replies; 3+ messages in thread
From: Sean Christopherson @ 2020-09-11 16:28 UTC (permalink / raw)
To: Vitaly Kuznetsov, Joerg Roedel
Cc: Colin King, kernel-janitors, linux-kernel, Paolo Bonzini,
Wanpeng Li, Jim Mattson, Joerg Roedel, Thomas Gleixner,
Ingo Molnar, Borislav Petkov, maintainer:X86 ARCHITECTURE,
H . Peter Anvin, kvm
+Joerg
On Fri, Sep 11, 2020 at 01:49:42PM +0200, Vitaly Kuznetsov wrote:
> Colin King <colin.king@canonical.com> writes:
>
> > From: Colin Ian King <colin.king@canonical.com>
> >
> > Currently the error exit path to outt_set_gif will kfree on
> > uninitialized
>
> typo: out_set_gif
>
> > pointers save and ctl. Fix this by ensuring these pointers are
> > inintialized to NULL to avoid garbage pointer freeing.
> >
> > Addresses-Coverity: ("Uninitialized pointer read")
> > Fixes: 6ccbd29ade0d ("KVM: SVM: nested: Don't allocate VMCB structures
> > on stack")
>
> Where is this commit id from? I don't see it in Paolo's kvm tree, if
> it's not yet merged, maybe we should fix it and avoid introducing the
> issue in the first place?
Ya, AFAIK the series as not been applied.
> > Signed-off-by: Colin Ian King <colin.king@canonical.com>
> > ---
> > arch/x86/kvm/svm/nested.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
> > index 28036629abf8..2b15f49f9e5a 100644
> > --- a/arch/x86/kvm/svm/nested.c
> > +++ b/arch/x86/kvm/svm/nested.c
> > @@ -1060,8 +1060,8 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,
> > struct vmcb *hsave = svm->nested.hsave;
> > struct vmcb __user *user_vmcb = (struct vmcb __user *)
> > &user_kvm_nested_state->data.svm[0];
> > - struct vmcb_control_area *ctl;
> > - struct vmcb_save_area *save;
> > + struct vmcb_control_area *ctl = NULL;
> > + struct vmcb_save_area *save = NULL;
> > int ret;
> > u32 cr0;
>
> I think it would be better if we eliminate 'out_set_gif; completely as
> the 'error path' we have looks a bit weird anyway. Something like
> (untested):
Ya, I agree that duplicating the single line for this one-off case is
preferable to creating a convoluted set of labels.
Joerg, can you fold this change into a prep patch for v4 of your "KVM: SVM:
SEV-ES groundwork" series?
> diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
> index 28036629abf8..d1ae94f40907 100644
> --- a/arch/x86/kvm/svm/nested.c
> +++ b/arch/x86/kvm/svm/nested.c
> @@ -1092,7 +1092,8 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,
>
> if (!(kvm_state->flags & KVM_STATE_NESTED_GUEST_MODE)) {
> svm_leave_nested(svm);
> - goto out_set_gif;
> + svm_set_gif(svm, !!(kvm_state->flags & KVM_STATE_NESTED_GIF_SET));
> + return 0;
> }
>
> if (!page_address_valid(vcpu, kvm_state->hdr.svm.vmcb_pa))
> @@ -1145,7 +1146,6 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu,
> load_nested_vmcb_control(svm, ctl);
> nested_prepare_vmcb_control(svm);
>
> -out_set_gif:
> svm_set_gif(svm, !!(kvm_state->flags & KVM_STATE_NESTED_GIF_SET));
>
> ret = 0;
>
> --
> Vitaly
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-11 16:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-11 11:07 [PATCH][next] KVM: SVM: nested: fix free of uninitialized pointers save and ctl Colin King
2020-09-11 11:49 ` Vitaly Kuznetsov
2020-09-11 16:28 ` Sean Christopherson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).