Commit f146cbc2 authored by Joe Hattori's avatar Joe Hattori Committed by Wentao Guan
Browse files

regulator: of: Implement the unwind path of of_regulator_match() 

stable inclusion
from stable-v6.6.76
commit d54308079d0513f2a884bacae1b1a8fa4c0a1834
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBW08Q

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d54308079d0513f2a884bacae1b1a8fa4c0a1834



--------------------------------

[ Upstream commit dddca3b2fc676113c58b04aaefe84bfb958ac83e ]

of_regulator_match() does not release the OF node reference in the error
path, resulting in an OF node leak. Therefore, call of_node_put() on the
obtained nodes before returning the EINVAL error.

Since it is possible that some drivers call this function and do not
exit on failure, such as s2mps11_pmic_driver, clear the init_data and
of_node in the error path.

This was reported by an experimental verification tool that I am
developing. As I do not have access to actual devices nor the QEMU board
configuration to test drivers that call this function, no runtime test
was able to be performed.

Fixes: 1c8fa58f ("regulator: Add generic DT parsing for regulators")
Signed-off-by: default avatarJoe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
Link: https://patch.msgid.link/20250104080453.2153592-1-joe@pf.is.s.u-tokyo.ac.jp


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
(cherry picked from commit d54308079d0513f2a884bacae1b1a8fa4c0a1834)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent ec8ddebe

drivers/regulator/of_regulator.c

+13 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ int of_regulator_match(struct device *dev, struct device_node *node, 
					"failed to parse DT for regulator %pOFn\n",

					child);

				of_node_put(child);

				return -EINVAL;

				goto err_put;

			}

			match->of_node = of_node_get(child);

			count++;
@@ -444,6 +444,18 @@ int of_regulator_match(struct device *dev, struct device_node *node, 
	}



	return count;



err_put:

	for (i = 0; i < num_matches; i++) {

		struct of_regulator_match *match = &matches[i];



		match->init_data = NULL;

		if (match->of_node) {

			of_node_put(match->of_node);

			match->of_node = NULL;

		}

	}

	return -EINVAL;

}

EXPORT_SYMBOL_GPL(of_regulator_match);