From: Colin Ian King <colin.king@xxxxxxxxxxxxx>
Currently if the call to of_resolve_phandles fails then then ovcs
is not kfree'd on the error exit path. Rather than try and make
the clean up exit path more convoluted, fix this by just kfree'ing
ovcs at the point of error detection and exit via the same exit
path.
Detected by CoverityScan, CID#1462296 ("Resource Leak")
Fixes: f948d6d8b792 ("of: overlay: avoid race condition between applying multiple overlays")
Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
---
drivers/of/overlay.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 53bc9e3f0b98..6c8efe7d8cbb 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -708,8 +708,10 @@ int of_overlay_apply(struct device_node *tree, int *ovcs_id)
of_overlay_mutex_lock();
ret = of_resolve_phandles(tree);
- if (ret)
+ if (ret) {
+ kfree(ovcs);
goto err_overlay_unlock;
+ }
mutex_lock(&of_mutex);
--
2.14.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
