From: Brian Gix <brian.gix@intel.com>
To: linux-bluetooth@vger.kernel.org
Cc: inga.stotland@intel.com, brian.gix@intel.com
Subject: [PATCH BlueZ] mesh: Fix decryption when on more than one Network
Date: Mon, 15 Apr 2019 12:56:26 -0700 [thread overview]
Message-ID: <20190415195626.16687-1-brian.gix@intel.com> (raw)
Multiple networks use different IV Index's, so we should only use
decryption cache after successful decoding.
---
mesh/net-keys.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mesh/net-keys.c b/mesh/net-keys.c
index 84e3982f5..1a2b590eb 100644
--- a/mesh/net-keys.c
+++ b/mesh/net-keys.c
@@ -216,7 +216,8 @@ uint32_t net_key_decrypt(uint32_t iv_index, const uint8_t *pkt, size_t len,
if (iv_pkt != iv_flag)
iv_index--;
- if (cache_len == len && memcmp(pkt, cache_pkt, len) == 0)
+ /* If we already successfully decrypted this packet, use cached data */
+ if (cache_id && cache_len == len && !memcmp(pkt, cache_pkt, len))
goto done;
cache_id = 0;
@@ -228,6 +229,7 @@ uint32_t net_key_decrypt(uint32_t iv_index, const uint8_t *pkt, size_t len,
l_queue_foreach(keys, decrypt_net_pkt, NULL);
done:
+ /* IV Index must match what was used to decrypt */
if (cache_iv_index != iv_index)
return 0;
--
2.14.5
reply other threads:[~2019-04-15 19:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190415195626.16687-1-brian.gix@intel.com \
--to=brian.gix@intel.com \
--cc=inga.stotland@intel.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).