LinuxTV Patchwork [3/3] media: atmel: atmel-isc: fix asd memory allocation

login
register
mail settings
Submitter Eugen Hristev
Date April 12, 2019, 10:19 a.m.
Message ID <1555064098-19310-4-git-send-email-eugen.hristev@microchip.com>
Download mbox | patch
Permalink /patch/55636/
State New
Delegated to: Hans Verkuil
Headers show

Comments

Eugen Hristev - April 12, 2019, 10:19 a.m.
From: Eugen Hristev <eugen.hristev@microchip.com>


The subsystem will free the asd memory on notifier cleanup, if the asd is
added to the notifier.
However the memory is freed using kfree.
Thus, we cannot allocate the asd using devm_*
This can lead to crashes and problems.
To test this issue, just return an error at probe, but cleanup the
notifier beforehand.

Fixes: 106267444f ("[media] atmel-isc: add the Image Sensor Controller code")
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>

---
 drivers/media/platform/atmel/atmel-isc.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

-- 
2.7.4

Patch

diff --git a/drivers/media/platform/atmel/atmel-isc.c b/drivers/media/platform/atmel/atmel-isc.c

index aef90db..8e072a9 100644

--- a/drivers/media/platform/atmel/atmel-isc.c

+++ b/drivers/media/platform/atmel/atmel-isc.c

@@ -2168,8 +2168,11 @@  static int isc_parse_dt(struct device *dev, struct isc_device *isc)

 			break;
 		}
 
-		subdev_entity->asd = devm_kzalloc(dev,

-				     sizeof(*subdev_entity->asd), GFP_KERNEL);

+		/* asd will be freed by the subsystem once it's added to the

+		 * notifier list

+		 */

+		subdev_entity->asd = kzalloc(sizeof(*subdev_entity->asd),

+					     GFP_KERNEL);

 		if (!subdev_entity->asd) {
 			of_node_put(rem);
 			ret = -ENOMEM;
@@ -2313,6 +2316,7 @@  static int atmel_isc_probe(struct platform_device *pdev)

 						     subdev_entity->asd);
 		if (ret) {
 			fwnode_handle_put(subdev_entity->asd->match.fwnode);
+			kfree(subdev_entity->asd);

 			goto cleanup_subdev;
 		}
 

Privacy Policy