Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Inga Stotland <inga.stotland@intel.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     brian.gix@intel.com, michal.lowas-rzechonek@silvair.com,
        jakub.witowski@silvair.com, Inga Stotland <inga.stotland@intel.com>
Subject: [PATCH BlueZ] mesh: Fix segmentation fault when removing a node
Date:   Thu,  4 Jul 2019 10:24:59 -0700
Message-Id: <20190704172459.21335-1-inga.stotland@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

This fixes a segmentation fault introduced by earlier changes.
Segmentation fault was used by accessing a queu that has been
destroyed, but the corresponding pointer hasn't been set to NULL.
---
 mesh/node.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mesh/node.c b/mesh/node.c
index ad94d885c..40b5256ec 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -222,7 +222,9 @@ static void element_free(void *data)
 	struct node_element *element = data;
 
 	l_queue_destroy(element->models, mesh_model_free);
+	element->models = NULL;
 	l_free(element->path);
+	element->path = NULL;
 	l_free(element);
 }
 
@@ -260,9 +262,12 @@ static void free_node_resources(void *data)
 	/* Unregister io callbacks */
 	if (node->net)
 		mesh_net_detach(node->net);
+
 	mesh_net_free(node->net);
 
 	l_queue_destroy(node->elements, element_free);
+	node->elements = NULL;
+
 	l_free(node->comp);
 
 	free_node_dbus_resources(node);
-- 
2.21.0