]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: davinci-vpif: Don't dereference endpoint after putting it, fix refcounting
authorSakari Ailus <sakari.ailus@linux.intel.com>
Thu, 4 Apr 2019 22:41:19 +0000 (18:41 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Thu, 25 Jul 2019 12:01:10 +0000 (08:01 -0400)
The davinci-vpif driver dereferences its local endpoints after releasing
the reference to them.

The driver also puts its endpoints explicitly while the
of_graph_get_next_endpoint() does that, too, leading to obtaining a
reference once and releasing it twice.

Both are fixed by this patch.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/platform/davinci/vpif_capture.c

index d5eadd45158776bb9b8b17fdf117a0b3e5fffe95..4bbb4fdeae92884407448d9486a16142e51144a2 100644 (file)
@@ -1545,7 +1545,6 @@ vpif_capture_get_pdata(struct platform_device *pdev)
                if (!rem) {
                        dev_dbg(&pdev->dev, "Remote device at %pOF not found\n",
                                endpoint);
-                       of_node_put(endpoint);
                        goto done;
                }
 
@@ -1557,7 +1556,6 @@ vpif_capture_get_pdata(struct platform_device *pdev)
                                            GFP_KERNEL);
                if (!chan->inputs) {
                        of_node_put(rem);
-                       of_node_put(endpoint);
                        goto err_cleanup;
                }
 
@@ -1568,7 +1566,6 @@ vpif_capture_get_pdata(struct platform_device *pdev)
 
                err = v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint),
                                                 &bus_cfg);
-               of_node_put(endpoint);
                if (err) {
                        dev_err(&pdev->dev, "Could not parse the endpoint\n");
                        of_node_put(rem);
@@ -1599,6 +1596,7 @@ vpif_capture_get_pdata(struct platform_device *pdev)
        }
 
 done:
+       of_node_put(endpoint);
        pdata->asd_sizes[0] = i;
        pdata->subdev_count = i;
        pdata->card_name = "DA850/OMAP-L138 Video Capture";
@@ -1606,6 +1604,7 @@ vpif_capture_get_pdata(struct platform_device *pdev)
        return pdata;
 
 err_cleanup:
+       of_node_put(endpoint);
        v4l2_async_notifier_cleanup(&vpif_obj.notifier);
 
        return NULL;