From 347117afd8e0d467224395f1ab82c9d1879e69b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Lowas-Rzechonek?= Date: Thu, 6 Aug 2020 16:21:08 +0200 Subject: [PATCH] mesh: Allow deleting non-existing net key When deleting a non-existing key, first check that it doesn't exist (and return success), then verify it's not the last key we have. --- mesh/net.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mesh/net.c b/mesh/net.c index b54c647cb..a163343cb 100644 --- a/mesh/net.c +++ b/mesh/net.c @@ -800,15 +800,15 @@ int mesh_net_del_key(struct mesh_net *net, uint16_t idx) if (!net) return MESH_STATUS_UNSPECIFIED_ERROR; - /* Cannot remove primary key */ - if (l_queue_length(net->subnets) <= 1) - return MESH_STATUS_CANNOT_REMOVE; - subnet = l_queue_find(net->subnets, match_key_index, L_UINT_TO_PTR(idx)); if (!subnet) return MESH_STATUS_SUCCESS; + /* Cannot remove primary key */ + if (l_queue_length(net->subnets) <= 1) + return MESH_STATUS_CANNOT_REMOVE; + /* Delete associated app keys */ appkey_delete_bound_keys(net, idx); -- 2.47.3