diff mbox series

[BlueZ,2/2] mesh: Reply error if appkey added for wrong netkey

Message ID 20220923113149.14209-3-isak.westin@loytec.com (mailing list archive)
State Accepted
Commit 95d9dc6764fc3859af9528c222eef95e843a9cbc
Headers show
Series Mesh: Fixes to comply with mesh profile | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/checkpatch success Checkpatch PASS
tedd_an/gitlint success Gitlint PASS

Commit Message

Isak Westin Sept. 23, 2022, 11:31 a.m. UTC 
If a known appkey is added for a different netkey, the status reply
should be Invalid NetKey.
---
 mesh/appkey.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/mesh/appkey.c b/mesh/appkey.c
index 52fed8c31..f31d81942 100644
--- a/mesh/appkey.c
+++ b/mesh/appkey.c
@@ -296,7 +296,9 @@  int appkey_key_add(struct mesh_net *net, uint16_t net_idx, uint16_t app_idx,
 
 	key = l_queue_find(app_keys, match_key_index, L_UINT_TO_PTR(app_idx));
 	if (key) {
-		if (memcmp(new_key, key->key, 16) == 0)
+		if (key->net_idx != net_idx)
+			return MESH_STATUS_INVALID_NETKEY;
+		else if (memcmp(new_key, key->key, 16) == 0)
 			return MESH_STATUS_SUCCESS;
 		else
 			return MESH_STATUS_IDX_ALREADY_STORED;