net: dsa: sja1105: Prevent leaking memory
Vladimir Oltean
maintainerPATCH 1/1 net: dsa: sja1105: Prevent leaking memory
From: Navid Emamdoost <[email protected]>
In sja1105_static_config_upload, in two cases memory is leaked: when static_config_buf_prepare_for_upload fails and when sja1105_inhibit_tx fails. In both cases config_buf should be released.
Fixes 8aa9ebccae87 ("net: dsa: Introduce driver for NXP SJA1105 5-port L2 switch")
Fixes 1a4c69406cc1 ("net: dsa: sja1105: Prevent PHY jabbering during switch reset")
Signed-off-by Navid Emamdoost <[email protected]>
Signed-off-by Vladimir Oltean <[email protected]>
---
Changes since v3:
I took over the patch and fixed formatting.
drivers/net/dsa/sja1105/sja1105_spi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/dsa/sja1105/sja1105_spi.c +4 -2
@@ -409,7 +409,8 @@ int sja1105_static_config_upload(struct sja1105_private *priv) rc =static_config_buf_prepare_for_upload (priv, config_buf, buf_len);if (rc <0 ) {dev_err (dev,"Invalid config, cannot upload\n" ); -return -EINVAL ; + rc = -EINVAL ; + goto out; }/* Prevent PHY jabbering during switch reset by inhibiting * Tx on all ports and waiting for current packet to drain.
@@ -418,7 +419,8 @@ int sja1105_static_config_upload(struct sja1105_private *priv) rc =sja1105_inhibit_tx (priv, port_bitmap, true);if (rc <0 ) {dev_err (dev,"Failed to inhibit Tx on ports\n" ); -return -ENXIO ; + rc = -ENXIO ; + goto out; }/* Wait for an eventual egress packet to finish transmission * (reach IFG). It is guaranteed that a second one will not
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Vladimir Oltean <[email protected]>
Date: Sun, 29 Sep 2019 01:43:39 +0300
Quoted 10 lines
From: Navid Emamdoost <[email protected]>
In
sja1105_static_config_upload, in two cases memory is leaked: whenstatic_config_buf_prepare_for_uploadfails and whensja1105_inhibit_txfails. In both casesconfig_bufshould be released.Fixes 8aa9ebccae87 ("net: dsa: Introduce driver for NXP SJA1105 5-port L2 switch")Fixes 1a4c69406cc1 ("net: dsa: sja1105: Prevent PHY jabbering during switch reset")Signed-off-by Navid Emamdoost <[email protected]>Signed-off-by Vladimir Oltean <[email protected]>
Applied and queued up for -stable.