Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: 0f8+j8lTyb2Ca3Bhddbi2zAg183HxtGkx+jc6nkFgEnXwgC1vgnEDpGHRAeRcZmKpgye1/lL3s
 burzti/RHCSg==
IronPort-SDR: mU4GhWXcxocwWxUI7GnzkxIvAUQ/l37/VYDKP0pDKGuDXsVBfx+VUxC9Ak6x4Kgwn2i6YFdPw7
 wAinwgtgkDEw==
From:   Inga Stotland <inga.stotland@intel.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     brian.gix@intel.com, Inga Stotland <inga.stotland@intel.com>
Subject: [PATCH BlueZ] mesh: Fix memory leak when failing to load a node
Date:   Mon,  9 Nov 2020 20:24:51 -0800
Message-Id: <20201110042451.71288-1-inga.stotland@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

This fixes a memory leak that may occur on unsuccessful element
initialization from storage.
---
 mesh/node.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/mesh/node.c b/mesh/node.c
index 11b0c9442..35293e0f0 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -326,16 +326,13 @@ static bool add_element_from_storage(struct mesh_node *node,
 
 	ele->idx = db_ele->index;
 	ele->location = db_ele->location;
-
-
-	if (!ele->models)
-		ele->models = l_queue_new();
+	ele->models = l_queue_new();
+	l_queue_push_tail(node->elements, ele);
 
 	if (!mesh_model_add_from_storage(node, ele->idx, ele->models,
 							db_ele->models))
 		return false;
 
-	l_queue_push_tail(node->elements, ele);
 	return true;
 }
 
-- 
2.26.2