| Message ID | 20190918171020.5745-1-navid.emamdoost@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: dsa: sja1105: prevent leaking memory | expand |
On Wed, Sep 18, 2019 at 12:10:19PM -0500, Navid Emamdoost 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. > > Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> Hi Navid Please could you provide a Fixes: tag for where this memory leak was introduced. > --- > drivers/net/dsa/sja1105/sja1105_spi.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/dsa/sja1105/sja1105_spi.c b/drivers/net/dsa/sja1105/sja1105_spi.c > index 84dc603138cf..80e86c714efb 100644 > --- a/drivers/net/dsa/sja1105/sja1105_spi.c > +++ b/drivers/net/dsa/sja1105/sja1105_spi.c > @@ -408,8 +408,9 @@ 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; > + dev_err(dev, "Invalid config, cannot upload\n"); What changed in this dev_err() call? Thanks Andrew
diff --git a/drivers/net/dsa/sja1105/sja1105_spi.c b/drivers/net/dsa/sja1105/sja1105_spi.c index 84dc603138cf..80e86c714efb 100644 --- a/drivers/net/dsa/sja1105/sja1105_spi.c +++ b/drivers/net/dsa/sja1105/sja1105_spi.c @@ -408,8 +408,9 @@ 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; + dev_err(dev, "Invalid config, cannot upload\n"); + 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. Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> --- drivers/net/dsa/sja1105/sja1105_spi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)