Commit 55e95bfc authored by Dan Carpenter's avatar Dan Carpenter Committed by Rob Herring
Browse files

of: dynamic: Fix potential memory leak in of_changeset_action() 



Smatch complains that the error path where "action" is invalid leaks
the "ce" allocation:
    drivers/of/dynamic.c:935 of_changeset_action()
    warn: possible memory leak of 'ce'

Fix this by doing the validation before the allocation.

Note that there is not any actual problem with upstream kernels. All
callers of of_changeset_action() are static inlines with fixed action
values.

Fixes: 914d9d83 ("of: dynamic: Refactor action prints to not use "%pOF" inside devtree_lock")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/r/202309011059.EOdr4im9-lkp@intel.com/


Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/7dfaf999-30ad-491c-9615-fb1138db121c@moroto.mountain


Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 0bb80ecc

drivers/of/dynamic.c

+3 −3
Original line number Diff line number Diff line
@@ -890,13 +890,13 @@ int of_changeset_action(struct of_changeset *ocs, unsigned long action, 
{

	struct of_changeset_entry *ce;



	if (WARN_ON(action >= ARRAY_SIZE(action_names)))

		return -EINVAL;



	ce = kzalloc(sizeof(*ce), GFP_KERNEL);

	if (!ce)

		return -ENOMEM;



	if (WARN_ON(action >= ARRAY_SIZE(action_names)))

		return -EINVAL;



	/* get a reference to the node */

	ce->action = action;

	ce->np = of_node_get(np);