FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-15 06:00:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

i40e: avoid use of uninitialized v_budget in i40e_init_msix

Browse Source 
This I40E_FCOE block increments v_budget before it has been initialized,
then v_budget gets overwritten a few lines later.  This patch just
reorders the code hunks in what I believe was the intended sequence.

Coverity: CID 1260099

Signed-off-by: John W Linville <linville@tuxdriver.com>
Tested-by: Jim Young <james.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
John W Linville 2015-01-14 03:06:28 +00:00 committed by Jeff Kirsher
parent cf86da489d
commit 83840e4bd5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/intel/i40e/i40e_main.c
View File

@ -6933,17 +6933,17 @@ static int i40e_init_msix(struct i40e_pf *pf)
if (pf->flags & I40E_FLAG_FD_SB_ENABLED) if (pf->flags & I40E_FLAG_FD_SB_ENABLED)
other_vecs++; other_vecs++;
/* Scale down if necessary, and the rings will share vectors */
pf->num_lan_msix = min_t(int, pf->num_lan_msix,
(hw->func_caps.num_msix_vectors - other_vecs));
v_budget = pf->num_lan_msix + other_vecs;
#ifdef I40E_FCOE #ifdef I40E_FCOE
if (pf->flags & I40E_FLAG_FCOE_ENABLED) { if (pf->flags & I40E_FLAG_FCOE_ENABLED) {
pf->num_fcoe_msix = pf->num_fcoe_qps; pf->num_fcoe_msix = pf->num_fcoe_qps;
v_budget += pf->num_fcoe_msix; v_budget += pf->num_fcoe_msix;
} }
#endif #endif
/* Scale down if necessary, and the rings will share vectors */
pf->num_lan_msix = min_t(int, pf->num_lan_msix,
(hw->func_caps.num_msix_vectors - other_vecs));
v_budget = pf->num_lan_msix + other_vecs;
pf->msix_entries = kcalloc(v_budget, sizeof(struct msix_entry), pf->msix_entries = kcalloc(v_budget, sizeof(struct msix_entry),
GFP_KERNEL); GFP_KERNEL);