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>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 88bd27ace8d9a11e76d8c37cb9ea3e5c5babf7f5..79dcadb40857631473b3c55fbe08de4e56d839e7 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -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);
                }
        }