Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d037d896 authored by Stefan Assmann's avatar Stefan Assmann Committed by Greg Kroah-Hartman
Browse files

i40e: fix return of uninitialized aq_ret in i40e_set_vsi_promisc 



[ Upstream commit e1e1b5356eb48dce4307f5cae10e4d6d5bd3df74 ]

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c: In function ‘i40e_set_vsi_promisc’:
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c:1176:14: error: ‘aq_ret’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
  i40e_status aq_ret;

In case the code inside the if statement and the for loop does not get
executed aq_ret will be uninitialized when the variable gets returned at
the end of the function.

Avoid this by changing num_vlans from int to u16, so aq_ret always gets
set. Making this change in additional places as num_vlans should never
be negative.

Fixes: 37d318d7805f ("i40e: Remove scheduling while atomic possibility")
Signed-off-by: default avatarStefan Assmann <sassmann@kpanic.de>
Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2d78e2d3

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

+5 −5
Original line number Diff line number Diff line
@@ -1125,7 +1125,7 @@ static int i40e_quiesce_vf_pci(struct i40e_vf *vf) 
static int __i40e_getnum_vf_vsi_vlan_filters(struct i40e_vsi *vsi)

{

	struct i40e_mac_filter *f;

	int num_vlans = 0, bkt;

	u16 num_vlans = 0, bkt;



	hash_for_each(vsi->mac_filter_hash, bkt, f, hlist) {

		if (f->vlan >= 0 && f->vlan <= I40E_MAX_VLANID)
@@ -1161,7 +1161,7 @@ static int i40e_getnum_vf_vsi_vlan_filters(struct i40e_vsi *vsi) 
 *

 * Called to get number of VLANs and VLAN list present in mac_filter_hash.

 **/

static void i40e_get_vlan_list_sync(struct i40e_vsi *vsi, int *num_vlans,

static void i40e_get_vlan_list_sync(struct i40e_vsi *vsi, u16 *num_vlans,

				    s16 **vlan_list)

{

	struct i40e_mac_filter *f;
@@ -1196,7 +1196,7 @@ static void i40e_get_vlan_list_sync(struct i40e_vsi *vsi, int *num_vlans, 
 **/

static i40e_status

i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable,

		     bool unicast_enable, s16 *vl, int num_vlans)

		     bool unicast_enable, s16 *vl, u16 num_vlans)

{

	i40e_status aq_ret, aq_tmp = 0;

	struct i40e_pf *pf = vf->pf;
@@ -1295,7 +1295,7 @@ static i40e_status i40e_config_vf_promiscuous_mode(struct i40e_vf *vf, 
	i40e_status aq_ret = I40E_SUCCESS;

	struct i40e_pf *pf = vf->pf;

	struct i40e_vsi *vsi;

	int num_vlans;

	u16 num_vlans;

	s16 *vl;



	vsi = i40e_find_vsi_from_id(pf, vsi_id);