Commits · f14f8de52ad71175b2b8e4130abcaddef4a05fac · LMODroid / platform_packages_modules_Bluetooth

Aug 24, 2023

Merge "Fix an OOB Write bug in avrc_vendor_msg" into tm-dev am: am: · f14f8de5

Hui Peng authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23253860

Change-Id: I1538c8c2384f4f3a618281b4abbd409615a93124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f14f8de5

Merge "Fix an OOB Write bug in avrc_vendor_msg" into tm-dev am: · 3454d1b4

Hui Peng authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23253860

Change-Id: Id1e9134edbf37d136deca27be6c8e7fc67e591cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3454d1b4

Merge "Fix an OOB Write bug in avrc_vendor_msg" into tm-dev · 14621c25
Hui Peng authored 1 year ago

14621c25

Aug 08, 2023

Merge "Fix an integer underflow in build_read_multi_rsp" into tm-dev am: am: · c0bac7ff

Hui Peng authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23252652

Change-Id: Ia97a8ab9d7954b70f3954dee27c35e76a8f98205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c0bac7ff

Merge "Fix an integer underflow in build_read_multi_rsp" into tm-dev am: · 83b5e1ad

Hui Peng authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23252652

Change-Id: Id4fd7cae60dd5175a5a8946aec2783a492d0a141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

83b5e1ad

Aug 07, 2023
- Merge "Fix an integer underflow in build_read_multi_rsp" into tm-dev · 82ce3fef
  Hui Peng authored 1 year ago
  
  82ce3fef
Aug 05, 2023

Merge "RESTRICT AUTOMERGE Revert "Fix a type confusion bug in... · cb9ab4b8

Hui Peng authored 1 year ago

Merge "RESTRICT AUTOMERGE Revert "Fix a type confusion bug in bta_av_setconfig_rej"" into tm-dev am: 4c2af764 am: aec62eaa

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/24131190

Change-Id: I2f65b31299b08674893918aa9e182a24563c904e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cb9ab4b8

RESTRICT AUTOMERGE Revert "Fix a type confusion bug in bta_av_setconfig_rej"... · 847a7d64

Hui Peng authored 1 year ago

RESTRICT AUTOMERGE Revert "Fix a type confusion bug in bta_av_setconfig_rej" am: 5a4c8f3b am: d3b74266

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/24131190

Change-Id: Ia2c0d7f8f51b72428a70c112ccc05f4e3af85773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

847a7d64

Merge "RESTRICT AUTOMERGE Revert "Fix a type confusion bug in... · aec62eaa

Hui Peng authored 1 year ago

Merge "RESTRICT AUTOMERGE Revert "Fix a type confusion bug in bta_av_setconfig_rej"" into tm-dev am: 4c2af764

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/24131190

Change-Id: I5f3f936e4bc380afa27390cdf79d1d2094e63b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

aec62eaa

RESTRICT AUTOMERGE Revert "Fix a type confusion bug in bta_av_setconfig_rej" am: · d3b74266

Hui Peng authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/24131190

Change-Id: I4d75a7c0014b1984ee14d3313792368d01632517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

d3b74266

Merge "RESTRICT AUTOMERGE Revert "Fix a type confusion bug in bta_av_setconfig_rej"" into tm-dev · 4c2af764
Hui Peng authored 1 year ago

4c2af764

Aug 04, 2023

RESTRICT AUTOMERGE Revert "Fix a type confusion bug in bta_av_setconfig_rej" · 5a4c8f3b

Hui Peng authored 1 year ago

This reverts commit bbd88e88.

Reason for revert: b/281788858

Merged-In: Id5f74a0f9c27f67050ffef497bb42580f30bfe38
Merged-In: If6fb57064b5b2da40842e2c1cf95aadc6f0351b6
Merged-In: I608fd8b8838a2476bf0b1d9dbb86c75032eec2f3

Change-Id: I0f45c87ba5f0b2c84843e568ca117439b42d1ed3

5a4c8f3b

Jul 27, 2023
- Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev · ee28c936
  Treehugger Robot authored 1 year ago
  
  ee28c936
Jul 26, 2023

Import translations. DO NOT MERGE ANYWHERE · fdc55ec0

Bill Yi authored 1 year ago

Auto-generated-cl: translation import
Change-Id: I7a08749ffa8935e3fda79ee74be43661cd6d35b5

fdc55ec0

Import translations. DO NOT MERGE ANYWHERE · 1d9e653b

Bill Yi authored 1 year ago

Auto-generated-cl: translation import
Change-Id: Ia98ec0294bf78e404fc5162a4933d1a30f46dec2

1d9e653b

Jun 23, 2023

Import translations. DO NOT MERGE ANYWHERE · 6ab8da0d

Bill Yi authored 1 year ago

Auto-generated-cl: translation import
Change-Id: Iae6d579461dc65525d99e933ba5071597e127a79

6ab8da0d

Jun 22, 2023
- Merge "floss: Fix empty peer name issue when RNR is skipped" into tm-qpr-dev · db983322
  David Duarte authored 1 year ago
  
  db983322
Jun 06, 2023
- Merge "Temporarily disable failing HeadsetServiceAndStateMachineTest" into tm-qpr-dev · 9760d9ab
  Yuyang Huang authored 1 year ago
  
  9760d9ab
Jun 05, 2023

Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev · b8b0a3ad
TreeHugger Robot authored 1 year ago

b8b0a3ad

Temporarily disable failing HeadsetServiceAndStateMachineTest · 46013104

Yuyang Huang authored 2 years ago

Test: atest BluetoothInstrumentationTests
Bug: 271351629
(cherry picked from https://android-review.googlesource.com/q/commit:95216457f02bb074eddf40322337f70dfa2d4e1c)
Merged-In: I8be0a5bcbb8c26e3ef178bcb25973783045b9f31
Change-Id: I8be0a5bcbb8c26e3ef178bcb25973783045b9f31

46013104

Import translations. DO NOT MERGE ANYWHERE · 95eaddaf

Bill Yi authored 1 year ago

Auto-generated-cl: translation import
Change-Id: I6a9bd036dad568d53fa671de675c613c30c88167

95eaddaf

Import translations. DO NOT MERGE ANYWHERE · 31d22997

Bill Yi authored 1 year ago

Auto-generated-cl: translation import
Change-Id: I2345c2b02fb7b4ebb75c1d012fe77bd0e6fd50f7

31d22997

Jun 02, 2023

Merge "Fix UAF in gatt_cl.cc" into tm-dev am: am: · 6c4ef160

Brian Delwiche authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22581496

Change-Id: I89af4509c56b2c6c8c836e14e004209314abb38b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6c4ef160

Merge "Fix UAF in gatt_cl.cc" into tm-dev am: · 91c161a1

Brian Delwiche authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22581496

Change-Id: Ib7c9450d1ead66dd16c00ae3591c2c7efc7b7a7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

91c161a1

Merge "Fix UAF in gatt_cl.cc" into tm-dev · 813e5845
Brian Delwiche authored 1 year ago

813e5845

May 24, 2023

Merge "Fix potential abort in btu_av_act.cc" into tm-dev am: am: · b3462f0f

Brian Delwiche authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21609715

Change-Id: I9dd980ac9357ade7cdcd885e81145ffab9020e4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b3462f0f

Merge "Fix potential abort in btu_av_act.cc" into tm-dev am: · 9d48efea

Brian Delwiche authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/21609715

Change-Id: I8706187fb778ea1ca35291b08773fb52181dc335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9d48efea

Merge "Fix potential abort in btu_av_act.cc" into tm-dev · 9607396b
Brian Delwiche authored 1 year ago

9607396b

floss: Fix empty peer name issue when RNR is skipped · 21271b21

Ying Hsu authored 2 years ago

Peer devices with BTM_SEC_NAME_KNOWN flag set have their
device names stored in sec_bd_name. If RNR is skipped
for this kind of device, bat_dm_search_cb.peer_name would
be empty and sec_bd_name shall be used instead.
Therefore, this patch uses bta_dm_get_remname() to fill up
the tBTA_DM_MSG in bta_dm_discover_device() and applies the
same indirection layer to similar situations for consistency.

Bug: 283178131
Tag: #floss
Test: Manual test - pairing with the problematic keyboard in the specific way problem was introduced
(cherry picked from https://android-review.googlesource.com/q/commit:fdeaf43e1508ba92d5455a636994b906a7b915db)
Merged-In: I7a297ff9a53ccbd6f3b9283e61ed208b000e6678
Change-Id: I7a297ff9a53ccbd6f3b9283e61ed208b000e6678

21271b21

May 22, 2023

Import translations. DO NOT MERGE ANYWHERE · ad6b0811

Bill Yi authored 1 year ago

Auto-generated-cl: translation import
Change-Id: I5fec6f37af61825ce9f20a4b3d7c471f6629a3e3

ad6b0811

May 19, 2023

Fix an integer underflow in build_read_multi_rsp · 85f4d53c

Hui Peng authored 1 year ago

When p_buf->len is mtu - 1 and p_cmd->multi_req.variable_len
evaluates to true, integer underflow is triggered
in the following line, resulting OOB access.

```
 len = p_rsp->attr_value.len - (total_len - mtu);
```

Bug: 273874525
Test: manual
Ignore-AOSP-First: security
Tag: #security

Merged-In: Ia60dd829ff9152c083de1f4c1265bb3ad595dcc4
Change-Id: Ia60dd829ff9152c083de1f4c1265bb3ad595dcc4

85f4d53c

Fix an OOB Write bug in avrc_vendor_msg · d5de235b

Hui Peng authored 1 year ago

Plus some cleanup

Bug: 271962784
Test: manual
Ignore-AOSP-First: security
Tag: #security
Merged-In: Ice5ad780ac0b177c73d84ed37960b4540df1ec86
Change-Id: Ice5ad780ac0b177c73d84ed37960b4540df1ec86

d5de235b

Merge "Fix integer overflow in build_read_multi_rsp" into tm-dev am: am: · 90c8779b

Brian Delwiche authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22726306

Change-Id: Id4949daa2c63b7ab132e23efe4f9c2e21541864e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

90c8779b

Merge "Fix integer overflow in build_read_multi_rsp" into tm-dev am: · 95966322

Brian Delwiche authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22726306

Change-Id: I5dc67f531b235302c6bf8904609af1d7e0d869b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

95966322

May 18, 2023
- Merge "Fix integer overflow in build_read_multi_rsp" into tm-dev · 0db5f1b1
  Brian Delwiche authored 1 year ago
  
  0db5f1b1
May 17, 2023

Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev · 4aedd9bf
TreeHugger Robot authored 1 year ago

4aedd9bf

Fix an integer overflow bug in avdt_msg_asmbl am: am: · 5e673575

Hui Peng authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23152778

Change-Id: Ia79662831bfe5d8a40a7c9b63e9f2eaf15b19852
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5e673575

Fix an integer overflow bug in avdt_msg_asmbl am: · df75554b

Hui Peng authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23152778

Change-Id: I0d6c9381f451aba707f54c1da27319b5ee097a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

df75554b

Import translations. DO NOT MERGE ANYWHERE · 6a69cc56

Bill Yi authored 1 year ago

Auto-generated-cl: translation import
Change-Id: If5e4e4cd37f0ea71f1344c17979fdade36535e00

6a69cc56

May 16, 2023

Fix an integer overflow bug in avdt_msg_asmbl · bf9449a7

Hui Peng authored 1 year ago

Bug: 280633699
Test: manual
Ignore-AOSP-First: security
Tag: #security
Change-Id: Iaa4d603921fc4ffb8cfb5783f99ec0963affd6a2

bf9449a7