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 v2] mesh: Fix segmentation fault when removing a node
Date:   Thu,  4 Jul 2019 10:36:06 -0700
Message-Id: <20190704173606.21793-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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mesh/node.c b/mesh/node.c
index ad94d885c..8e9da8988 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -260,12 +260,16 @@ static void free_node_resources(void *data)
 	/* Unregister io callbacks */
 	if (node->net)
 		mesh_net_detach(node->net);
+
 	mesh_net_free(node->net);
+	node->net = NULL;
 
 	l_queue_destroy(node->elements, element_free);
-	l_free(node->comp);
+	node->elements = NULL;
 
 	free_node_dbus_resources(node);
+
+	l_free(node->comp);
 	l_free(node);
 }
 
-- 
2.21.0