* [PATCH][V2] of: overlay: fix memory leak of ovcs on error exit path
@ 2017-11-30 12:57 Colin King
0 siblings, 0 replies; only message in thread
From: Colin King @ 2017-11-30 12:57 UTC (permalink / raw)
To: Pantelis Antoniou, Rob Herring, Frank Rowand, devicetree
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
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: bd80e2555c5c ("of: overlay: Fix cleanup order in of_overlay_apply()")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-11-30 12:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-30 12:57 [PATCH][V2] of: overlay: fix memory leak of ovcs on error exit path Colin King
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).