• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

system/bt


Commit MetaInfo

Révisionf5543f1027892dc30dfc0d4ddc195a80897308bd (tree)
l'heure2020-05-08 11:55:55
AuteurChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Message de Log

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

Modification

--- a/service/gatt_server.cc
+++ b/service/gatt_server.cc
@@ -16,6 +16,7 @@
1616
1717 #include "service/gatt_server.h"
1818
19+#include "osi/include/log.h"
1920 #include "service/logging_helpers.h"
2021 #include "stack/include/bt_types.h"
2122
@@ -114,6 +115,12 @@ bool GattServer::SendResponse(const std::string& device_address, int request_id,
114115 return false;
115116 }
116117
118+ if (offset < 0) {
119+ android_errorWriteLog(0x534e4554, "143231677");
120+ LOG(ERROR) << "Offset is less than 0 offset: " << offset;
121+ return false;
122+ }
123+
117124 if (value.size() + offset > BTGATT_MAX_ATTR_LEN) {
118125 LOG(ERROR) << "Value is too large";
119126 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) {
278278 ******************************************************************************/
279279 bool aes_cipher_msg_auth_code(BT_OCTET16 key, uint8_t* input, uint16_t length,
280280 uint16_t tlen, uint8_t* p_signature) {
281- uint16_t len, diff;
281+ uint32_t len;
282+ uint16_t diff;
282283 uint16_t n = (length + BT_OCTET16_LEN - 1) /
283284 BT_OCTET16_LEN; /* n is number of rounds */
284285 bool ret = false;