| Message ID | 20190918203407.23826-1-navid.emamdoost@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v3] net: dsa: sja1105: prevent leaking memory | expand |
On Wed, 18 Sep 2019 at 23:34, Navid Emamdoost <navid.emamdoost@gmail.com> wrote: > > 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 <navid.emamdoost@gmail.com> > --- Reviewed-by: Vladimir Oltean <olteanv@gmail.com> > drivers/net/dsa/sja1105/sja1105_spi.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/dsa/sja1105/sja1105_spi.c b/drivers/net/dsa/sja1105/sja1105_spi.c > index 84dc603138cf..58dd37ecde17 100644 > --- a/drivers/net/dsa/sja1105/sja1105_spi.c > +++ b/drivers/net/dsa/sja1105/sja1105_spi.c > @@ -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 > -- > 2.17.1 >
From: Navid Emamdoost <navid.emamdoost@gmail.com> Date: Wed, 18 Sep 2019 15:34:06 -0500 > Fixes: 8aa9ebccae87 ("net: dsa: Introduce driver for NXP SJA1105 5-port > L2 switch") > > Fixes: 1a4c69406cc1 ("net: dsa: sja1105: Prevent PHY jabbering during > switch reset") Please: 1) Do not break Fixes: tags into multiples lines, that way the string is easily greppable. 2) Do not separate the Fixes: from other tags with newlines. It is just another tag like Signed-off-by: and Acked-by: Thanks.
diff --git a/drivers/net/dsa/sja1105/sja1105_spi.c b/drivers/net/dsa/sja1105/sja1105_spi.c index 84dc603138cf..58dd37ecde17 100644 --- a/drivers/net/dsa/sja1105/sja1105_spi.c +++ b/drivers/net/dsa/sja1105/sja1105_spi.c @@ -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
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 <navid.emamdoost@gmail.com> --- drivers/net/dsa/sja1105/sja1105_spi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)