From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [net-next 11/11] i40e: fix error return code in i40e_probe() Date: Tue, 29 Oct 2013 18:57:22 -0400 (EDT) Message-ID: <20131029.185722.1940335622558600585.davem@davemloft.net> References: <1383048151-15002-1-git-send-email-jeffrey.t.kirsher@intel.com> <1383048151-15002-12-git-send-email-jeffrey.t.kirsher@intel.com> <1383066330.2713.20.camel@joe-AO722> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: jeffrey.t.kirsher@intel.com, yongjun_wei@trendmicro.com.cn, netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com To: joe@perches.com Return-path: Received: from shards.monkeyblade.net ([149.20.54.216]:49544 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750971Ab3J2W5Y (ORCPT ); Tue, 29 Oct 2013 18:57:24 -0400 In-Reply-To: <1383066330.2713.20.camel@joe-AO722> Sender: netdev-owner@vger.kernel.org List-ID: From: Joe Perches Date: Tue, 29 Oct 2013 10:05:30 -0700 > On Tue, 2013-10-29 at 05:02 -0700, Jeff Kirsher wrote: >> Fix to return -ENOMEM in the memory alloc error handling >> case instead of 0, as done elsewhere in this function. > > trivial note: > >> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c > [] >> @@ -7204,8 +7204,10 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) >> */ >> len = sizeof(struct i40e_vsi *) * pf->hw.func_caps.num_vsis; >> pf->vsi = kzalloc(len, GFP_KERNEL); >> - if (!pf->vsi) >> + if (!pf->vsi) { >> + err = -ENOMEM; >> goto err_switch_setup; >> + } > > This might be better as: > > pf->vsi = kcalloc(pf->hw.func_caps.num_vsis, struct i40e_vsi *), > GFP_KERNEL); > > and removing the now unused u32 len; declaration. Agreed but that's a follow-on patch rather than something to block this pull request.