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, Inga Stotland <inga.stotland@intel.com>
Subject: [PATCH BlueZ] mesh: Fix configuration update when deleting an AppKey
Date:   Thu, 12 Dec 2019 12:00:24 -0800
Message-Id: <20191212200024.2617-1-inga.stotland@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

When an AppKey is deleted from a node, the configuration update
is sent to the element model only if the model was bound to this
AppKey.
---
 mesh/model.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mesh/model.c b/mesh/model.c
index acdd94f7b..d998a9caa 100644
--- a/mesh/model.c
+++ b/mesh/model.c
@@ -650,7 +650,7 @@ static void model_unbind_idx(struct mesh_node *node, struct mesh_model *mod,
 		/* Internal model */
 		mod->cbs->bind(idx, ACTION_DELETE);
 
-	if (mod->pub && idx != mod->pub->idx)
+	if (!mod->pub || idx != mod->pub->idx)
 		return;
 
 	/* Remove model publication if the publication key is unbound */
@@ -1319,7 +1319,8 @@ void mesh_model_app_key_delete(struct mesh_node *node, struct l_queue *models,
 	for (; entry; entry = entry->next) {
 		struct mesh_model *model = entry->data;
 
-		model_unbind_idx(node, model, app_idx);
+		if (has_binding(model->bindings, app_idx))
+			model_unbind_idx(node, model, app_idx);
 	}
 }
 
-- 
2.21.0