Skip to content

Commit

Permalink
media: v4l2-core: Fix a potential resource leak in v4l2_fwnode_parse_…
Browse files Browse the repository at this point in the history
…link()

[ Upstream commit d7b13ed ]

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: ca50c19 ("[media] v4l: fwnode: Support generic fwnode for parsing standardised properties")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
tititiou36 authored and gregkh committed Sep 13, 2023
1 parent aeb79a1 commit 25afb3e
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions drivers/media/v4l2-core/v4l2-fwnode.c
Expand Up @@ -551,19 +551,29 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode,
link->local_id = fwep.id;
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_id = fwep.id;
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);

Expand Down

0 comments on commit 25afb3e

Please sign in to comment.