Message ID | 20180327142148.13603-1-colin.king@canonical.com |
---|---|
State | Accepted |
Delegated to: | Jeff Kirsher |
Headers | show |
Series | [next] ixgbevf: ensure xdp_ring resources are free'd on error exit | expand |
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On > Behalf Of Colin King > Sent: Tuesday, March 27, 2018 7:22 AM > To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>; intel-wired- > lan@lists.osuosl.org; netdev@vger.kernel.org > Cc: kernel-janitors@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: [Intel-wired-lan] [PATCH][next] ixgbevf: ensure xdp_ring resources > are free'd on error exit > > From: Colin Ian King <colin.king@canonical.com> > > The current error handling for failed resource setup for xdp_ring data is a > break out of the loop and returning 0 indicated everying was OK, when in fact > it is not. Fix this by exiting via the error exit label err_setup_tx that will clean > up the resources correctly and return and error status. > > Detected by CoverityScan, CID#1466879 ("Logically dead code") > > Fixes: 21092e9ce8b1 ("ixgbevf: Add support for XDP_TX action") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index 3d9033f26eff..e3d04f226d57 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c @@ -3420,7 +3420,7 @@ static int ixgbevf_setup_all_tx_resources(struct ixgbevf_adapter *adapter) if (!err) continue; hw_dbg(&adapter->hw, "Allocation for XDP Queue %u failed\n", j); - break; + goto err_setup_tx; } return 0;