Commit cec279a8 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: sja1105: add error handling in sja1105_setup() 



If any of sja1105_static_config_load(), sja1105_clocking_setup() or
sja1105_devlink_setup() fails, we can't just return in the middle of
sja1105_setup() or memory will leak. Add a cleanup path.

Fixes: 0a7bdbc2 ("net: dsa: sja1105: move devlink param code to sja1105_devlink.c")
Fixes: 8aa9ebcc ("net: dsa: Introduce driver for NXP SJA1105 5-port L2 switch")
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc596e3f

drivers/net/dsa/sja1105/sja1105_main.c

+14 −3
Original line number Diff line number Diff line
@@ -2976,13 +2976,13 @@ static int sja1105_setup(struct dsa_switch *ds) 
	rc = sja1105_static_config_load(priv, ports);

	if (rc < 0) {

		dev_err(ds->dev, "Failed to load static config: %d\n", rc);

		return rc;

		goto out_ptp_clock_unregister;

	}

	/* Configure the CGU (PHY link modes and speeds) */

	rc = sja1105_clocking_setup(priv);

	if (rc < 0) {

		dev_err(ds->dev, "Failed to configure MII clocking: %d\n", rc);

		return rc;

		goto out_static_config_free;

	}

	/* On SJA1105, VLAN filtering per se is always enabled in hardware.

	 * The only thing we can do to disable it is lie about what the 802.1Q
@@ -3003,7 +3003,7 @@ static int sja1105_setup(struct dsa_switch *ds) 


	rc = sja1105_devlink_setup(ds);

	if (rc < 0)

		return rc;

		goto out_static_config_free;



	/* The DSA/switchdev model brings up switch ports in standalone mode by

	 * default, and that means vlan_filtering is 0 since they're not under
@@ -3012,6 +3012,17 @@ static int sja1105_setup(struct dsa_switch *ds) 
	rtnl_lock();

	rc = sja1105_setup_8021q_tagging(ds, true);

	rtnl_unlock();

	if (rc)

		goto out_devlink_teardown;



	return 0;



out_devlink_teardown:

	sja1105_devlink_teardown(ds);

out_ptp_clock_unregister:

	sja1105_ptp_clock_unregister(ds);

out_static_config_free:

	sja1105_static_config_free(&priv->static_config);



	return rc;

}