Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23429423 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

media: v4l2-core: Fix a potential resource leak in v4l2_fwnode_parse_link() 



[ Upstream commit d7b13edd4cb4bfa335b6008ab867ac28582d3e5c ]

If fwnode_graph_get_remote_endpoint() fails, 'fwnode' is known to be NULL,
so fwnode_handle_put() is a no-op.

Release the reference taken from a previous fwnode_graph_get_port_parent()
call instead.

Also handle fwnode_graph_get_port_parent() failures.

In order to fix these issues, add an error handling path to the function
and the needed gotos.

Fixes: ca50c197 ("[media] v4l: fwnode: Support generic fwnode for parsing standardised properties")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6d121aac

drivers/media/v4l2-core/v4l2-fwnode.c

+14 −4
Original line number Diff line number Diff line
@@ -289,18 +289,28 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode, 
	fwnode_graph_parse_endpoint(fwnode, &fwep);

	link->local_port = fwep.port;

	link->local_node = fwnode_graph_get_port_parent(fwnode);

	if (!link->local_node)

		return -ENOLINK;



	fwnode = fwnode_graph_get_remote_endpoint(fwnode);

	if (!fwnode) {

		fwnode_handle_put(fwnode);

		return -ENOLINK;

	}

	if (!fwnode)

		goto err_put_local_node;



	fwnode_graph_parse_endpoint(fwnode, &fwep);

	link->remote_port = fwep.port;

	link->remote_node = fwnode_graph_get_port_parent(fwnode);

	if (!link->remote_node)

		goto err_put_remote_endpoint;



	return 0;



err_put_remote_endpoint:

	fwnode_handle_put(fwnode);



err_put_local_node:

	fwnode_handle_put(link->local_node);



	return -ENOLINK;

}

EXPORT_SYMBOL_GPL(v4l2_fwnode_parse_link);