This series fixes an error path where the reference of a child node is not decremented upon early return. When at it, a trivial comma/semicolon substitution I found by chance has been added to improve code clarity.
Signed-off-by: Javier Carrasco javier.carrasco.cruz@gmail.com --- Javier Carrasco (2): pinctrl: intel: platform: fix error path in device_for_each_child_node() pinctrl: intel: platform: use semicolon instead of comma in ncommunities assignment
drivers/pinctrl/intel/pinctrl-intel-platform.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- base-commit: 92fc9636d1471b7f68bfee70c776f7f77e747b97 change-id: 20240926-intel-pinctrl-platform-scoped-68d000ba3c1d
Best regards,
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: stable@vger.kernel.org Fixes: c5860e4a2737 ("pinctrl: intel: Add a generic Intel pin control platform driver") Signed-off-by: Javier Carrasco javier.carrasco.cruz@gmail.com --- drivers/pinctrl/intel/pinctrl-intel-platform.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/pinctrl/intel/pinctrl-intel-platform.c b/drivers/pinctrl/intel/pinctrl-intel-platform.c index 4a19ab3b4ba7..2d5ba8278fb9 100644 --- a/drivers/pinctrl/intel/pinctrl-intel-platform.c +++ b/drivers/pinctrl/intel/pinctrl-intel-platform.c @@ -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; @@ -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;
On Thu, Sep 26, 2024 at 04:11:01PM +0200, Javier Carrasco wrote:
This series fixes an error path where the reference of a child node is not decremented upon early return. When at it, a trivial comma/semicolon substitution I found by chance has been added to improve code clarity.
Signed-off-by: Javier Carrasco javier.carrasco.cruz@gmail.com
Javier Carrasco (2): pinctrl: intel: platform: fix error path in device_for_each_child_node() pinctrl: intel: platform: use semicolon instead of comma in ncommunities assignment
Both,
Acked-by: Mika Westerberg mika.westerberg@linux.intel.com
On Thu, Sep 26, 2024 at 04:11:01PM +0200, Javier Carrasco wrote:
This series fixes an error path where the reference of a child node is not decremented upon early return. When at it, a trivial comma/semicolon substitution I found by chance has been added to improve code clarity.
Signed-off-by: Javier Carrasco javier.carrasco.cruz@gmail.com
Javier Carrasco (2): pinctrl: intel: platform: fix error path in device_for_each_child_node() pinctrl: intel: platform: use semicolon instead of comma in ncommunities assignment
drivers/pinctrl/intel/pinctrl-intel-platform.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
base-commit: 92fc9636d1471b7f68bfee70c776f7f77e747b97
Try hard to avoid basing your commits on Linux Next. This is a specific subsystem and you can just use Intel pinctrl tree for that.
No need to resend this time, I fixed the issue manually.
linux-stable-mirror@lists.linaro.org