Commit: b7f8f4d38ae634b9a30c4481c3a907e17a173c61 - system-bt (git)

system/bt

Commit MetaInfo

• Revisión: b7f8f4d38ae634b9a30c4481c3a907e17a173c61 (tree)
• Tiempo: 2020-04-10 05:45:17
• Autor: Jakub Pawlowski <jpawlowski@goog...>
• Commiter: Anis Assi

Log Message

Fix potential stack overflow caused by integer overflow

Bug: 151155194
Merged-In: I0655b0b62301f78cd8705cc7b0e4fc11522f00ca
Change-Id: I0655b0b62301f78cd8705cc7b0e4fc11522f00ca
(cherry picked from commit 1570b62c88d7c5b9c6bfe43da8cc16ea30d3e8df)

Cambiar Resumen

• modified: stack/smp/smp_cmac.cc

Diferencia incremental

--- a/stack/smp/smp_cmac.cc
+++ b/stack/smp/smp_cmac.cc
@@ -278,7 +278,8 @@ static bool cmac_generate_subkey(BT_OCTET16 key) {
  ******************************************************************************/
 bool aes_cipher_msg_auth_code(BT_OCTET16 key, uint8_t* input, uint16_t length,
                               uint16_t tlen, uint8_t* p_signature) {
-  uint16_t len, diff;
+  uint32_t len;
+  uint16_t diff;
   uint16_t n = (length + BT_OCTET16_LEN - 1) /
                BT_OCTET16_LEN; /* n is number of rounds */
   bool ret = false;