[PATCH] ieee802154: ca8210: prevent memory leak

Subsystems: ca8210 ieee-802.15.4 radio driver, ieee 802.15.4 subsystem, networking drivers, the rest

STALE2545d LANDED

Landed in mainline as 6402939ec86e on 2019-09-27.

3 messages, 2 authors, 2019-09-27 · open the first message on its own page

[PATCH] ieee802154: ca8210: prevent memory leak

From: Navid Emamdoost <hidden>
Date: 2019-09-17 22:47:29

In ca8210_probe the allocated pdata needs to be assigned to
spi_device->dev.platform_data before calling ca8210_get_platform_data. 
Othrwise when ca8210_get_platform_data fails pdata cannot be released.

Signed-off-by: Navid Emamdoost <redacted>
---
 drivers/net/ieee802154/ca8210.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ieee802154/ca8210.c b/drivers/net/ieee802154/ca8210.c
index b188fce3f641..229d70a897ca 100644
--- a/drivers/net/ieee802154/ca8210.c
+++ b/drivers/net/ieee802154/ca8210.c

@@ -3152,12 +3152,12 @@ static int ca8210_probe(struct spi_device *spi_device)
 		goto error;
 	}
 
+	priv->spi->dev.platform_data = pdata;
 	ret = ca8210_get_platform_data(priv->spi, pdata);
 	if (ret) {
 		dev_crit(&spi_device->dev, "ca8210_get_platform_data failed\n");
 		goto error;
 	}
-	priv->spi->dev.platform_data = pdata;
 
 	ret = ca8210_dev_com_init(priv);
 	if (ret) {

-- 
2.17.1

Re: [PATCH] ieee802154: ca8210: prevent memory leak

From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: 2019-09-19 14:56:47

Hello Harry.

On 18.09.19 00:47, Navid Emamdoost wrote:

quoted hunk

In ca8210_probe the allocated pdata needs to be assigned to
spi_device->dev.platform_data before calling ca8210_get_platform_data. 
Othrwise when ca8210_get_platform_data fails pdata cannot be released.

Signed-off-by: Navid Emamdoost <redacted>
---
 drivers/net/ieee802154/ca8210.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ieee802154/ca8210.c b/drivers/net/ieee802154/ca8210.c
index b188fce3f641..229d70a897ca 100644
--- a/drivers/net/ieee802154/ca8210.c
+++ b/drivers/net/ieee802154/ca8210.c

@@ -3152,12 +3152,12 @@ static int ca8210_probe(struct spi_device *spi_device)
 		goto error;
 	}
 
+	priv->spi->dev.platform_data = pdata;
 	ret = ca8210_get_platform_data(priv->spi, pdata);
 	if (ret) {
 		dev_crit(&spi_device->dev, "ca8210_get_platform_data failed\n");
 		goto error;
 	}
-	priv->spi->dev.platform_data = pdata;
 
 	ret = ca8210_dev_com_init(priv);
 	if (ret) {

Could you review this patch for the ca8210 driver?

regards
Stefan Schmidt

Re: [PATCH] ieee802154: ca8210: prevent memory leak

From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: 2019-09-27 20:01:14

Hello.

On 18.09.19 00:47, Navid Emamdoost wrote:

quoted hunk

In ca8210_probe the allocated pdata needs to be assigned to
spi_device->dev.platform_data before calling ca8210_get_platform_data.
Othrwise when ca8210_get_platform_data fails pdata cannot be released.

Signed-off-by: Navid Emamdoost <redacted>
---
  drivers/net/ieee802154/ca8210.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ieee802154/ca8210.c b/drivers/net/ieee802154/ca8210.c
index b188fce3f641..229d70a897ca 100644
--- a/drivers/net/ieee802154/ca8210.c
+++ b/drivers/net/ieee802154/ca8210.c

@@ -3152,12 +3152,12 @@ static int ca8210_probe(struct spi_device *spi_device)
  		goto error;
  	}
  
+	priv->spi->dev.platform_data = pdata;
  	ret = ca8210_get_platform_data(priv->spi, pdata);
  	if (ret) {
  		dev_crit(&spi_device->dev, "ca8210_get_platform_data failed\n");
  		goto error;
  	}
-	priv->spi->dev.platform_data = pdata;
  
  	ret = ca8210_dev_com_init(priv);
  	if (ret) {

As Harry seems to be unavailable I am taking this patch directly.


This patch has been applied to the wpan tree and will be
part of the next pull request to net. Thanks!

regards
Stefan Schmidt

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help