Commit be9c64b1 authored Jul 06, 2018 by Arnd Bergmann Committed by David S. Miller Jul 07, 2018

mlxsw: spectrum_router: avoid uninitialized variable access

When CONFIG_BRIDGE_VLAN_FILTERING is disabled, gcc correctly points out
that the 'vid' variable is uninitialized whenever br_vlan_get_pvid
returns an error:

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c: In function 'mlxsw_sp_rif_vlan_fid_get':
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c:6881:6: error: 'vid' may be used uninitialized in this function [-Werror=maybe-uninitialized]

This changes the condition check to always return -EINVAL here,
which I guess is what the author intended here.

Fixes: e6f1960a ("mlxsw: spectrum_router: Allocate FID according to PVID")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e2664f97

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -6878,11 +6878,9 @@ mlxsw_sp_rif_vlan_fid_get(struct mlxsw_sp_rif *rif,
		vid = vlan_dev_vlan_id(rif->dev);
		} else {
		err = br_vlan_get_pvid(rif->dev, &vid);
		if (!vid)
		err = -EINVAL;
		if (err) {
		if (err < 0 \|\| !vid) {
		NL_SET_ERR_MSG_MOD(extack, "Couldn't determine bridge PVID");
		return ERR_PTR(err);
		return ERR_PTR(-EINVAL);
		}
		}