Received-SPF: pass (google.com: domain of linux-kernel+bounces-214346-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Fri, 14 Jun 2024 08:00:54 +0300
From: Dan Carpenter <dan.carpenter@linaro.org>
To: Sean Christopherson <seanjc@google.com>
Cc: Yi Wang <foxywang@tencent.com>, Paolo Bonzini <pbonzini@redhat.com>,
	Christian Borntraeger <borntraeger@linux.ibm.com>,
	kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
	kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] KVM: fix an error code in kvm_create_vm()
Message-ID: <29ed61a4-5f06-4c27-aed4-5ac3de3f45ae@moroto.mountain>
References: <02051e0a-09d8-49a2-917f-7c2f278a1ba1@moroto.mountain>
 <ZmuF2PsVot33fS1x@google.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ZmuF2PsVot33fS1x@google.com>

On Thu, Jun 13, 2024 at 04:50:48PM -0700, Sean Christopherson wrote:
> On Thu, Jun 13, 2024, Dan Carpenter wrote:
> > This error path used to return -ENOMEM from the where r is initialized
> > at the top of the function.  But a new "r = kvm_init_irq_routing(kvm);"
> > was introduced in the middle of the function so now the error code is
> > not set and it eventually leads to a NULL dereference.  Set the error
> > code back to -ENOMEM.
> > 
> > Fixes: fbe4a7e881d4 ("KVM: Setup empty IRQ routing when creating a VM")
> > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> > ---
> >  virt/kvm/kvm_main.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> > index 07ec9b67a202..ea7e32d722c9 100644
> > --- a/virt/kvm/kvm_main.c
> > +++ b/virt/kvm/kvm_main.c
> > @@ -1212,8 +1212,10 @@ static struct kvm *kvm_create_vm(unsigned long type, const char *fdname)
> >  	for (i = 0; i < KVM_NR_BUSES; i++) {
> >  		rcu_assign_pointer(kvm->buses[i],
> >  			kzalloc(sizeof(struct kvm_io_bus), GFP_KERNEL_ACCOUNT));
> > -		if (!kvm->buses[i])
> > +		if (!kvm->buses[i]) {
> > +			r = -ENOMEM;
> >  			goto out_err_no_arch_destroy_vm;
> > +		}
> >  	}
> 
> Drat.  Any objection to tweaking this slightly to guard against similar bugs in
> the future?  If not, I'll apply+push the below.

No objections from me.  :)

regards,
dan carpenter