mlxsw: spectrum_switchdev: Avoid leaking FID's reference count

It should never be possible for a user to set a VNI on a FID in case one
is already set. The driver therefore returns an error, but fails to drop
the reference count taken earlier when calling
mlxsw_sp_fid_8021d_lookup().

Drop the reference when this unlikely error is hit.

Fixes: 1c30d1836a ("mlxsw: spectrum: Enable VxLAN enslavement to bridges")
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ido Schimmel 2018-12-06 17:44:51 +00:00 committed by David S. Miller
parent 050fc01fb1
commit f58a83c207
1 changed files with 5 additions and 2 deletions

View File

@ -2134,8 +2134,10 @@ mlxsw_sp_bridge_8021d_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device,
if (!fid) if (!fid)
return -EINVAL; return -EINVAL;
if (mlxsw_sp_fid_vni_is_set(fid)) if (mlxsw_sp_fid_vni_is_set(fid)) {
return -EINVAL; err = -EINVAL;
goto err_vni_exists;
}
err = mlxsw_sp_nve_fid_enable(mlxsw_sp, fid, &params, extack); err = mlxsw_sp_nve_fid_enable(mlxsw_sp, fid, &params, extack);
if (err) if (err)
@ -2149,6 +2151,7 @@ mlxsw_sp_bridge_8021d_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device,
return 0; return 0;
err_nve_fid_enable: err_nve_fid_enable:
err_vni_exists:
mlxsw_sp_fid_put(fid); mlxsw_sp_fid_put(fid);
return err; return err;
} }