提交: f5543f1027892dc30dfc0d4ddc195a80897308bd - system-bt (git)

system/bt

Commit MetaInfo

• 修訂: f5543f1027892dc30dfc0d4ddc195a80897308bd (tree)
• 時間: 2020-05-08 11:55:55
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Android 8.1.0 release 76
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXrBHFQAKCRDorT+BmrEO
eKjGAJ959Enb7SOOTTUMChpZl2d65gpnQgCeM1glqV8wKbm2JnqbJYluTwGftU0=
=2M7C
-----END PGP SIGNATURE-----

Merge tag 'android-8.1.0_r76' into oreo-x86

Android 8.1.0 release 76

Change Summary

• modified: service/gatt_server.cc
• modified: stack/smp/smp_cmac.cc

差異

--- a/service/gatt_server.cc
+++ b/service/gatt_server.cc
@@ -16,6 +16,7 @@
 
 #include "service/gatt_server.h"
 
+#include "osi/include/log.h"
 #include "service/logging_helpers.h"
 #include "stack/include/bt_types.h"
 
@@ -114,6 +115,12 @@ bool GattServer::SendResponse(const std::string& device_address, int request_id,
     return false;
   }
 
+  if (offset < 0) {
+    android_errorWriteLog(0x534e4554, "143231677");
+    LOG(ERROR) << "Offset is less than 0 offset: " << offset;
+    return false;
+  }
+
   if (value.size() + offset > BTGATT_MAX_ATTR_LEN) {
     LOG(ERROR) << "Value is too large";
     return false;

--- 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;