| From ac366154058864582da2a5d51a8213f37914fb98 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 4 Oct 2019 13:58:43 -0500 |
| Subject: of: unittest: fix memory leak in unittest_data_add |
| |
| From: Navid Emamdoost <navid.emamdoost@gmail.com> |
| |
| [ Upstream commit e13de8fe0d6a51341671bbe384826d527afe8d44 ] |
| |
| In unittest_data_add, a copy buffer is created via kmemdup. This buffer |
| is leaked if of_fdt_unflatten_tree fails. The release for the |
| unittest_data buffer is added. |
| |
| Fixes: b951f9dc7f25 ("Enabling OF selftest to run without machine's devicetree") |
| Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> |
| Reviewed-by: Frank Rowand <frowand.list@gmail.com> |
| Signed-off-by: Rob Herring <robh@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/of/unittest.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c |
| index 2eac3df7dd290..af9e4785b7a6e 100644 |
| --- a/drivers/of/unittest.c |
| +++ b/drivers/of/unittest.c |
| @@ -924,6 +924,7 @@ static int __init unittest_data_add(void) |
| of_fdt_unflatten_tree(unittest_data, &unittest_data_node); |
| if (!unittest_data_node) { |
| pr_warn("%s: No tree to attach; not running tests\n", __func__); |
| + kfree(unittest_data); |
| return -ENODATA; |
| } |
| of_node_set_flag(unittest_data_node, OF_DETACHED); |
| -- |
| 2.20.1 |
| |
