media: rcar_drif: Fix fwnode reference leak when parsing DT (cdd4f782) · Commits · 戴 / test

The fwnode reference corresponding to the endpoint is leaked in an error path of the rcar_drif_parse_subdevs() function. Fix it, and reorganize fwnode reference handling in the function to release references early, simplifying error paths. Signed-off-by:

Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by:

Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by:

Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

drivers/media/platform/rcar_drif.c

+5 −11

Original line number	Diff line number	Diff line
		@@ -1227,28 +1227,22 @@ static int rcar_drif_parse_subdevs(struct rcar_drif_sdr *sdr)
		if (!ep)
		return 0;

		/* Get the endpoint properties */
		rcar_drif_get_ep_properties(sdr, ep);

		fwnode = fwnode_graph_get_remote_port_parent(ep);
		fwnode_handle_put(ep);
		if (!fwnode) {
		dev_warn(sdr->dev, "bad remote port parent\n");
		fwnode_handle_put(ep);
		return -EINVAL;
		}

		sdr->ep.asd.match.fwnode = fwnode;
		sdr->ep.asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
		ret = v4l2_async_notifier_add_subdev(notifier, &sdr->ep.asd);
		if (ret) {
		fwnode_handle_put(fwnode);
		return ret;
		}

		/* Get the endpoint properties */
		rcar_drif_get_ep_properties(sdr, ep);

		fwnode_handle_put(fwnode);
		fwnode_handle_put(ep);

		return 0;
		return ret;
		}

		/* Check if the given device is the primary bond */

Admin message