Message ID | 20200618141953.29674-1-weiyongjun1@huawei.com |
---|---|
State | Awaiting Upstream |
Delegated to: | David Miller |
Headers | show |
Series | iavf: fix error return code in iavf_init_get_resources() | expand |
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of > Wei Yongjun > Sent: Thursday, June 18, 2020 7:20 AM > To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>; Jakub Kicinski > <kuba@kernel.org> > Cc: intel-wired-lan@lists.osuosl.org; kernel-janitors@vger.kernel.org; Wei > Yongjun <weiyongjun1@huawei.com>; netdev@vger.kernel.org > Subject: [Intel-wired-lan] [PATCH] iavf: fix error return code in > iavf_init_get_resources() > > Fix to return negative error code -ENOMEM from the error handling case > instead of 0, as done elsewhere in this function. > > Fixes: b66c7bc1cd4d ("iavf: Refactor init state machine") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/net/ethernet/intel/iavf/iavf_main.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c index fa82768e5eda..bc83e2d99944 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c @@ -1863,8 +1863,10 @@ static int iavf_init_get_resources(struct iavf_adapter *adapter) adapter->rss_key = kzalloc(adapter->rss_key_size, GFP_KERNEL); adapter->rss_lut = kzalloc(adapter->rss_lut_size, GFP_KERNEL); - if (!adapter->rss_key || !adapter->rss_lut) + if (!adapter->rss_key || !adapter->rss_lut) { + err = -ENOMEM; goto err_mem; + } if (RSS_AQ(adapter)) adapter->aq_required |= IAVF_FLAG_AQ_CONFIGURE_RSS; else
Fix to return negative error code -ENOMEM from the error handling case instead of 0, as done elsewhere in this function. Fixes: b66c7bc1cd4d ("iavf: Refactor init state machine") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/net/ethernet/intel/iavf/iavf_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)