Skip to content
This repository has been archived by the owner on Oct 31, 2024. It is now read-only.

Commit

Permalink
pinctrl: intel: platform: fix error path in device_for_each_child_node()
Browse files Browse the repository at this point in the history
commit 16a6d2e upstream.

The device_for_each_child_node() loop requires calls to
fwnode_handle_put() upon early returns to decrement the refcount of
the child node and avoid leaking memory if that error path is triggered.

There is one early returns within that loop in
intel_platform_pinctrl_prepare_community(), but fwnode_handle_put() is
missing.

Instead of adding the missing call, the scoped version of the loop can
be used to simplify the code and avoid mistakes in the future if new
early returns are added, as the child node is only used for parsing, and
it is never assigned.

Cc: [email protected]
Fixes: c5860e4 ("pinctrl: intel: Add a generic Intel pin control platform driver")
Signed-off-by: Javier Carrasco <[email protected]>
Acked-by: Mika Westerberg <[email protected]>
Signed-off-by: Andy Shevchenko <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
javiercarrascocruz authored and gregkh committed Oct 22, 2024
1 parent 6441d9c commit be3f7b9
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/pinctrl/intel/pinctrl-intel-platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ static int intel_platform_pinctrl_prepare_community(struct device *dev,
struct intel_community *community,
struct intel_platform_pins *pins)
{
struct fwnode_handle *child;
struct intel_padgroup *gpps;
unsigned int group;
size_t ngpps;
Expand Down Expand Up @@ -131,7 +130,7 @@ static int intel_platform_pinctrl_prepare_community(struct device *dev,
return -ENOMEM;

group = 0;
device_for_each_child_node(dev, child) {
device_for_each_child_node_scoped(dev, child) {
struct intel_padgroup *gpp = &gpps[group];

gpp->reg_num = group;
Expand Down

0 comments on commit be3f7b9

Please sign in to comment.