mlxsw: spectrum_router: avoid uninitialized variable access
authorArnd Bergmann <arnd@arndb.de>
Fri, 6 Jul 2018 12:44:45 +0000 (14:44 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sat, 7 Jul 2018 11:06:08 +0000 (20:06 +0900)
commitbe9c64b19b8131459dd7107dc0ae209eeeaa9ce8
tree7e49e2cfb799b79d76649ddba2051bc0952fcf3a
parente2664f97c38c4f1bef3cbcc69969627c134aee17
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: e6f1960ae6c7 ("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>
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c