OSDN Git Service
Rahul Sabnis [Mon, 24 Aug 2020 23:36:36 +0000 (16:36 -0700)]
Send a response to an smp security request depending on the callback event
Tag: #feature
Bug:
157038281
Test: Manual
Merged-In: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351
Change-Id: Iadeb25a43b46f615b55a0dfb6e7723e5d1204351
Rahul Sabnis [Wed, 5 Aug 2020 21:53:28 +0000 (21:53 +0000)]
[automerger skipped] Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-dev am:
b2adda8177 am:
00fd683aec -s ours am:
14ae20b072 -s ours
am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1
0b4c1014f7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12309020
Change-Id: I345e6523f88819ffd331090c3d1671cd480641c6
Rahul Sabnis [Wed, 5 Aug 2020 21:35:45 +0000 (21:35 +0000)]
[automerger skipped] Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-dev am:
b2adda8177 am:
00fd683aec -s ours
am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1
0b4c1014f7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12309020
Change-Id: I64045645e5b0c45d25f239f52070f796e8162077
Rahul Sabnis [Wed, 5 Aug 2020 21:18:10 +0000 (21:18 +0000)]
Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-dev am:
b2adda8177
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12309020
Change-Id: I3cc71adac1897fb29ce5fb4012ed8b1567f1e614
Rahul Sabnis [Wed, 5 Aug 2020 21:17:00 +0000 (21:17 +0000)]
[automerger skipped] Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-mr1-dev am:
4256337c9e -s ours
am skip reason: Change-Id I6d06f5996da71e5a1407e544b0023d82924aa56f with SHA-1
ad8fba09ac is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12307949
Change-Id: Icdcade676ae8c5cf2b05f42ce92611c97afd2b68
Rahul Sabnis [Wed, 5 Aug 2020 20:56:23 +0000 (20:56 +0000)]
Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-dev
Rahul Sabnis [Wed, 5 Aug 2020 20:51:45 +0000 (20:51 +0000)]
Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into oc-mr1-dev
TreeHugger Robot [Wed, 5 Aug 2020 18:56:04 +0000 (18:56 +0000)]
Merge "Check whether local device is an ATV device to determine whether to show the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode" into pi-dev
weichinweng [Wed, 5 Aug 2020 12:32:35 +0000 (12:32 +0000)]
[automerger skipped] Fix possible OOB when receive gatt read type response data am:
342cb328b6 am:
6d86ead0e3 -s ours am:
4e8d3b8eba -s ours
am skip reason: Change-Id I1bd8713eecebc2bc3d919402b035987e06a2d4d3 with SHA-1
0eb7a763df is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12263265
Change-Id: Ia454d830d9e5e11883b83de17461b88d1c3d6a89
weichinweng [Wed, 5 Aug 2020 12:13:40 +0000 (12:13 +0000)]
[automerger skipped] Fix possible OOB when receive gatt read type response data am:
342cb328b6 am:
6d86ead0e3 -s ours
am skip reason: Change-Id I1bd8713eecebc2bc3d919402b035987e06a2d4d3 with SHA-1
0eb7a763df is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12263265
Change-Id: I0e10ba38b8aa463e7524ca0da1c2aa8ce5c86b5b
weichinweng [Wed, 5 Aug 2020 11:59:47 +0000 (11:59 +0000)]
Fix possible OOB when receive gatt read type response data am:
342cb328b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12263265
Change-Id: I064b5c88b2734129a9f1811f372713b01938ad9c
weichinweng [Wed, 5 Aug 2020 08:26:01 +0000 (08:26 +0000)]
Fix possible OOB when receive gatt read type response data am:
0eb7a763df
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12258750
Change-Id: I941c06817ca42034d8cc6e74aae49cf4fc1e4dbc
weichinweng [Tue, 28 Jul 2020 08:56:33 +0000 (16:56 +0800)]
Fix possible OOB when receive gatt read type response data
Bug:
158833854
Bug:
158778659
Test: manual
Tag: #security
Change-Id: I1bd8713eecebc2bc3d919402b035987e06a2d4d3
Merged-In: I1bd8713eecebc2bc3d919402b035987e06a2d4d3
Rahul Sabnis [Sat, 1 Aug 2020 02:44:27 +0000 (19:44 -0700)]
Check whether local device is an ATV device to determine whether to show
the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode
Tag: #feature
Bug:
157038281
Test: Manual
Merged-In: I6d06f5996da71e5a1407e544b0023d82924aa56f
Change-Id: I6d06f5996da71e5a1407e544b0023d82924aa56f
Rahul Sabnis [Sat, 1 Aug 2020 02:44:27 +0000 (19:44 -0700)]
Check whether local device is an ATV device to determine whether to show
the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode
Tag: #feature
Bug:
157038281
Test: Manual
Merged-In: I6d06f5996da71e5a1407e544b0023d82924aa56f
Change-Id: I6d06f5996da71e5a1407e544b0023d82924aa56f
Rahul Sabnis [Sat, 1 Aug 2020 02:44:27 +0000 (19:44 -0700)]
Check whether local device is an ATV device to determine whether to show
the consent dialog for BLE pairing in JUSTWORKS and ENCRYPTION_ONLY mode
Tag: #feature
Bug:
157038281
Test: Manual
Merged-In: I6d06f5996da71e5a1407e544b0023d82924aa56f
Change-Id: I6d06f5996da71e5a1407e544b0023d82924aa56f
weichinweng [Tue, 28 Jul 2020 08:56:33 +0000 (16:56 +0800)]
Fix possible OOB when receive gatt read type response data
Bug:
158833854
Bug:
158778659
Test: manual
Tag: #security
Change-Id: I1bd8713eecebc2bc3d919402b035987e06a2d4d3
Rahul Sabnis [Fri, 31 Jul 2020 01:09:09 +0000 (01:09 +0000)]
[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am:
57ffe1ba12 am:
70e77e9a2f -s ours am:
459630e366 -s ours
am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1
b5c0bfc132 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12040226
Change-Id: I7e5b93e63eadbda49fc9ff28a6308a72e99b6ef0
Rahul Sabnis [Fri, 31 Jul 2020 00:51:00 +0000 (00:51 +0000)]
[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am:
57ffe1ba12 am:
70e77e9a2f -s ours
am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1
b5c0bfc132 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12040226
Change-Id: I5ad01f31ae5ad09d350a04ff3414ae516ad0077d
Rahul Sabnis [Fri, 31 Jul 2020 00:27:46 +0000 (00:27 +0000)]
Shows a consent dialog on the local device when pairing a bluetooth low am:
57ffe1ba12
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12040226
Change-Id: I591af4f49890b67d9d110747984e1061aeaa9a57
Rahul Sabnis [Fri, 31 Jul 2020 00:11:56 +0000 (00:11 +0000)]
[automerger skipped] Shows a consent dialog on the local device when pairing a bluetooth low am:
b5c0bfc132 -s ours
am skip reason: Change-Id I7de396230beb84bd0fa2b0cea346523b6824472a with SHA-1
8709264b5c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
12040225
Change-Id: Ibf60879048f2eea001a0b5c3cf4f9a4fcdb3edd6
Rahul Sabnis [Fri, 26 Jun 2020 17:27:07 +0000 (10:27 -0700)]
Shows a consent dialog on the local device when pairing a bluetooth low
energy device if the local device has a display.
Tag: #security
Bug:
157038281
Test: Manual
Merged-In: I7de396230beb84bd0fa2b0cea346523b6824472a
Change-Id: I7de396230beb84bd0fa2b0cea346523b6824472a
Rahul Sabnis [Fri, 26 Jun 2020 17:27:07 +0000 (10:27 -0700)]
Shows a consent dialog on the local device when pairing a bluetooth low
energy device if the local device has a display.
Tag: #security
Bug:
157038281
Test: Manual
Merged-In: I7de396230beb84bd0fa2b0cea346523b6824472a
Change-Id: I7de396230beb84bd0fa2b0cea346523b6824472a
Rahul Sabnis [Fri, 26 Jun 2020 17:27:07 +0000 (10:27 -0700)]
Shows a consent dialog on the local device when pairing a bluetooth low
energy device if the local device has a display.
Tag: #security
Bug:
157038281
Test: Manual
Merged-In: I7de396230beb84bd0fa2b0cea346523b6824472a
Change-Id: I7de396230beb84bd0fa2b0cea346523b6824472a
Joseph Pirozzo [Fri, 26 Jun 2020 13:29:50 +0000 (13:29 +0000)]
Merge "Enable bitpool sanity checks" into oc-dev am:
15ccbf59de am:
b7bd79e254 am:
e7c4690a6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
11593936
Change-Id: Id273f7a0dcccdd41a0cc5f7dc9c782477aaf046b
Joseph Pirozzo [Fri, 26 Jun 2020 13:13:54 +0000 (13:13 +0000)]
Merge "Enable bitpool sanity checks" into oc-dev am:
15ccbf59de am:
b7bd79e254
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
11593936
Change-Id: I1f53339a2b08ec342d65fe45f6a69965b87edf4a
Joseph Pirozzo [Fri, 26 Jun 2020 13:01:21 +0000 (13:01 +0000)]
Merge "Enable bitpool sanity checks" into oc-dev am:
15ccbf59de
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
11593936
Change-Id: I53a4ce34dba71b7715f791a03b6128458f8bc7e8
Joseph Pirozzo [Fri, 26 Jun 2020 12:40:58 +0000 (12:40 +0000)]
Merge "Enable bitpool sanity checks" into oc-dev
Myles Watson [Thu, 25 Jun 2020 21:45:08 +0000 (21:45 +0000)]
[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am:
85b5df1d0d am:
ab50a6b284 -s ours am:
14b17d2fb1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
11934228
Change-Id: Ide10d75b623cdb0bc7047529ce0c79e57a18120f
Myles Watson [Thu, 25 Jun 2020 21:28:30 +0000 (21:28 +0000)]
[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am:
85b5df1d0d am:
ab50a6b284 -s ours
am skip reason: Change-Id I048b7b142e3fe2096cf1a9aa2931c175fa52cd45 with SHA-1
e29c52cfda is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
11934228
Change-Id: I01231f49767b1f5e54f43bf119e410a147198033
Myles Watson [Thu, 25 Jun 2020 21:15:23 +0000 (21:15 +0000)]
DO NOT MERGE: Remove pairing on incoming bond request am:
85b5df1d0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
11934228
Change-Id: Icf0c4b744a56a06669fea1effd45c898063a4631
Myles Watson [Thu, 25 Jun 2020 20:03:22 +0000 (20:03 +0000)]
[automerger skipped] DO NOT MERGE: Remove pairing on incoming bond request am:
e29c52cfda -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/
11931864
Change-Id: I289b55466f022e0ee4422a142427014146eeb936
Myles Watson [Thu, 18 Jun 2020 21:35:53 +0000 (14:35 -0700)]
DO NOT MERGE: Remove pairing on incoming bond request
Bug:
150156492
Tag: #security
Test: Bond two devices, forget from one device and reconnect
Change-Id: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45
(cherry picked from commit
13f409ad3a2423b06af7a7f1a9b06fb06c8820a7)
Merged-In: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45
Myles Watson [Thu, 18 Jun 2020 21:35:53 +0000 (14:35 -0700)]
DO NOT MERGE: Remove pairing on incoming bond request
Bug:
150156492
Tag: #security
Test: Bond two devices, forget from one device and reconnect
Change-Id: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45
(cherry picked from commit
13f409ad3a2423b06af7a7f1a9b06fb06c8820a7)
Merged-In: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45
Myles Watson [Thu, 18 Jun 2020 21:35:53 +0000 (14:35 -0700)]
Remove pairing on incoming bond request
Bug:
150156492
Tag: #security
Test: Bond two devices, forget from one device and reconnect
Change-Id: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45
Merged-In: I048b7b142e3fe2096cf1a9aa2931c175fa52cd45
(cherry picked from commit
13f409ad3a2423b06af7a7f1a9b06fb06c8820a7)
Joseph Pirozzo [Mon, 25 May 2020 17:36:26 +0000 (10:36 -0700)]
Enable bitpool sanity checks
Enable bitpool sanity checks to run all the time, not just in debug
mode.
Tag: #security
Test: sbcdecoder_fuzzer
Bug:
146398979
Change-Id: Iff58305cd18de35e37290f0c09fba01ee14e787a
Jakub Pawlowski [Tue, 7 Apr 2020 23:24:21 +0000 (23:24 +0000)]
Fix potential stack overflow caused by integer overflow am:
1570b62c88 am:
5b4bf745e9 am:
6360e91bb3
Change-Id: I1e23e75fd05e41b9cd31bb93b945135bef21c04f
Jakub Pawlowski [Tue, 7 Apr 2020 23:09:11 +0000 (23:09 +0000)]
Fix potential stack overflow caused by integer overflow am:
1570b62c88 am:
5b4bf745e9
Change-Id: I91417fff40a89042993a9fcbfaa6b7f45c162d89
Jakub Pawlowski [Tue, 7 Apr 2020 22:51:21 +0000 (22:51 +0000)]
Fix potential stack overflow caused by integer overflow am:
1570b62c88
Change-Id: Iaf75d5b63297d50e3115422f15fa8511133ef45a
Jakub Pawlowski [Fri, 20 Mar 2020 14:24:00 +0000 (15:24 +0100)]
Fix potential stack overflow caused by integer overflow
Bug:
151155194
Merged-In: I0655b0b62301f78cd8705cc7b0e4fc11522f00ca
Change-Id: I0655b0b62301f78cd8705cc7b0e4fc11522f00ca
Automerger Merge Worker [Wed, 11 Mar 2020 00:14:09 +0000 (00:14 +0000)]
[automerger skipped] GattServcer: Check invalid offset am:
30a2860ed1 am:
2865a273f2 -s ours am:
b9e373e364 -s ours
am skip reason: Change-Id I0396380f431cdb7f91c78db6de9043ea0f373dfe with SHA-1
c14c1fb864 is in history
Change-Id: I19ce865f59ffe8bee30c81401a480d1b32ee632b
Automerger Merge Worker [Tue, 10 Mar 2020 23:58:30 +0000 (23:58 +0000)]
[automerger skipped] GattServcer: Check invalid offset am:
30a2860ed1 am:
2865a273f2 -s ours
am skip reason: Change-Id I0396380f431cdb7f91c78db6de9043ea0f373dfe with SHA-1
c14c1fb864 is in history
Change-Id: Iba77996d7a5acdbee2865868d506634620ccf793
Automerger Merge Worker [Tue, 10 Mar 2020 23:42:03 +0000 (23:42 +0000)]
GattServcer: Check invalid offset am:
30a2860ed1
Change-Id: I1d3aae196fb82155b88e2377e96670797f228f8a
Hansong Zhang [Thu, 13 Feb 2020 19:40:44 +0000 (11:40 -0800)]
GattServcer: Check invalid offset
Test: manual
Bug:
143231677
Merged-In: I0396380f431cdb7f91c78db6de9043ea0f373dfe
Merged-In: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8
Change-Id: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8
Automerger Merge Worker [Tue, 10 Mar 2020 21:02:22 +0000 (21:02 +0000)]
[automerger skipped] GattServcer: Check invalid offset am:
c14c1fb864 -s ours
am skip reason: Change-Id I97e2c3ae15fccc482d07d8d621c455cc74900cfd with SHA-1
7674de8fc8 is in history
Change-Id: Ied357d149b40fd00da201593f9d3e16c899fa7ca
Hansong Zhang [Thu, 13 Feb 2020 19:40:44 +0000 (11:40 -0800)]
GattServcer: Check invalid offset
Test: manual
Bug:
143231677
Change-Id: I0396380f431cdb7f91c78db6de9043ea0f373dfe
Merged-In: I97e2c3ae15fccc482d07d8d621c455cc74900cfd
Merged-In: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8
Hansong Zhang [Thu, 13 Feb 2020 19:40:44 +0000 (11:40 -0800)]
GattServcer: Check invalid offset
Test: manual
Bug:
143231677
Change-Id: I97e2c3ae15fccc482d07d8d621c455cc74900cfd
Merged-In: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8
Hansong Zhang [Tue, 11 Feb 2020 23:15:22 +0000 (15:15 -0800)]
AAC Decoder: Use osi_free() to free buffers allocated by osi_malloc()
* buffers allocated by osi_malloc() have canary bytes around it and need special method
osi_free() to free them
Bug:
148107188
Test: manual
Change-Id: Ifcfe494737c47e33755297214d3f637852a8be0b
(cherry picked from commit
b88f8057fd28ca271ccd436a17f6489d4cf46697)
Automerger Merge Worker [Wed, 4 Dec 2019 08:31:45 +0000 (08:31 +0000)]
[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-mr1-dev am:
561bf0a604 -s ours
am skip reason: Change-Id Iaca4db4ee9bf27362f62aba0da088727e98955d1 with SHA-1
b4e8a17daa is in history
Change-Id: Iab0bb64fa4b03ea97330346476993a4812802264
Automerger Merge Worker [Wed, 4 Dec 2019 08:31:33 +0000 (08:31 +0000)]
[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev am:
2039ca38e9 am:
5b85308108 am:
477e110c07 -s ours
am skip reason: Change-Id Iaca4db4ee9bf27362f62aba0da088727e98955d1 with SHA-1
140d8297ac is in history
Change-Id: I818670e4df7c0d3b8d401fa8f6152aea39a412f1
TreeHugger Robot [Wed, 4 Dec 2019 08:29:41 +0000 (08:29 +0000)]
Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-mr1-dev
Automerger Merge Worker [Wed, 4 Dec 2019 08:22:12 +0000 (08:22 +0000)]
Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev am:
2039ca38e9 am:
5b85308108
Change-Id: I8c6f23a3cc7cfdb08242cbaa68ea62830ea49ccb
Automerger Merge Worker [Wed, 4 Dec 2019 08:13:37 +0000 (08:13 +0000)]
Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev am:
2039ca38e9
Change-Id: I0767ba267fc51a926930288752a1a079414d5a76
TreeHugger Robot [Wed, 4 Dec 2019 08:04:13 +0000 (08:04 +0000)]
Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev
TreeHugger Robot [Wed, 4 Dec 2019 07:49:36 +0000 (07:49 +0000)]
Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into pi-dev
Automerger Merge Worker [Tue, 3 Dec 2019 23:39:45 +0000 (23:39 +0000)]
Merge "SDP: add return after SDP disconnection" into oc-dev am:
765abc5cb6 am:
1f3bc32195 am:
52cd67a7de
Change-Id: I8aefeefb2a55d3548d47b10dab533bc7bff704f9
Automerger Merge Worker [Tue, 3 Dec 2019 23:29:41 +0000 (23:29 +0000)]
Merge "SDP: add return after SDP disconnection" into oc-dev am:
765abc5cb6 am:
1f3bc32195
Change-Id: I08a3792c2110c102e1a61051ff74bfa8ef8735c8
Automerger Merge Worker [Tue, 3 Dec 2019 23:21:52 +0000 (23:21 +0000)]
Merge "SDP: add return after SDP disconnection" into oc-dev am:
765abc5cb6
Change-Id: I4adccd7acc83181359c798527f6231a2b29e4429
TreeHugger Robot [Tue, 3 Dec 2019 23:03:51 +0000 (23:03 +0000)]
Merge "SDP: add return after SDP disconnection" into oc-dev
Automerger Merge Worker [Tue, 3 Dec 2019 00:58:27 +0000 (00:58 +0000)]
Merge "GAP: Correct the continuous pkt length in l2cap" into oc-dev am:
2a8a9b22f2 am:
5d8fde3e01 am:
5dbe08152a
Change-Id: I9b78c5b36d9d1382f307fabacc20bb74d2e91322
Automerger Merge Worker [Tue, 3 Dec 2019 00:47:12 +0000 (00:47 +0000)]
Merge "GAP: Correct the continuous pkt length in l2cap" into oc-dev am:
2a8a9b22f2 am:
5d8fde3e01
Change-Id: I95231c695e0ec4a413c3cce64b3ea16936cc1bff
Automerger Merge Worker [Tue, 3 Dec 2019 00:40:09 +0000 (00:40 +0000)]
Merge "GAP: Correct the continuous pkt length in l2cap" into oc-dev am:
2a8a9b22f2
Change-Id: I9ed3a6586a87f199cef8b90d8c8c7d6bbb862823
TreeHugger Robot [Tue, 3 Dec 2019 00:33:29 +0000 (00:33 +0000)]
Merge "GAP: Correct the continuous pkt length in l2cap" into oc-dev
Ted Wang [Tue, 26 Nov 2019 03:46:38 +0000 (11:46 +0800)]
Fix potential OOB write in btm_read_remote_ext_features_complete
Add event length check to avoid hci event sent from controller not
correct.
Add page number check to avoid page number is bigger than
HCI_EXT_FEATURES_PAGE_MAX.
Bug:
141552859
Bug:
144205318
Test: inject function
Merged-In: Iaca4db4ee9bf27362f62aba0da088727e98955d1
Change-Id: Iaca4db4ee9bf27362f62aba0da088727e98955d1
Ted Wang [Tue, 26 Nov 2019 03:46:38 +0000 (11:46 +0800)]
Fix potential OOB write in btm_read_remote_ext_features_complete
Add event length check to avoid hci event sent from controller not
correct.
Add page number check to avoid page number is bigger than
HCI_EXT_FEATURES_PAGE_MAX.
Bug:
141552859
Bug:
144205318
Test: inject function
Merged-In: Iaca4db4ee9bf27362f62aba0da088727e98955d1
Change-Id: Iaca4db4ee9bf27362f62aba0da088727e98955d1
Ted Wang [Tue, 26 Nov 2019 03:46:38 +0000 (11:46 +0800)]
Fix potential OOB write in btm_read_remote_ext_features_complete
Add event length check to avoid hci event sent from controller not
correct.
Add page number check to avoid page number is bigger than
HCI_EXT_FEATURES_PAGE_MAX.
Bug:
141552859
Bug:
144205318
Test: inject function
Merged-In: Iaca4db4ee9bf27362f62aba0da088727e98955d1
Change-Id: Iaca4db4ee9bf27362f62aba0da088727e98955d1
Automerger Merge Worker [Tue, 26 Nov 2019 03:46:52 +0000 (03:46 +0000)]
Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into oc-mr1-dev am:
c5cbe3c7fb
Change-Id: I6cc380ce5e08ea003cc2d12a767cff8a53705b6e
Ted Wang [Tue, 26 Nov 2019 03:33:50 +0000 (03:33 +0000)]
Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into oc-mr1-dev
Ted Wang [Tue, 26 Nov 2019 03:33:50 +0000 (03:33 +0000)]
Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into pi-dev
Automerger Merge Worker [Tue, 26 Nov 2019 03:04:10 +0000 (03:04 +0000)]
Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into oc-dev am:
aa754ed3ec am:
53afb387a4 am:
a651e35ad0
Change-Id: Idf9a04bc8291f8e08ca504c373d77750c1280b74
Automerger Merge Worker [Tue, 26 Nov 2019 02:55:04 +0000 (02:55 +0000)]
Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into oc-dev am:
aa754ed3ec am:
53afb387a4
Change-Id: I22fb89a33d6265470d4dc82a19d3ff66ce1ad9fa
Automerger Merge Worker [Tue, 26 Nov 2019 02:45:55 +0000 (02:45 +0000)]
Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into oc-dev am:
aa754ed3ec
Change-Id: I2cc0a9befe3c2b0412d53bad6b7790e61119cae2
Ted Wang [Tue, 26 Nov 2019 02:37:56 +0000 (02:37 +0000)]
Merge "Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"" into oc-dev
Zongheng Wang [Tue, 12 Nov 2019 20:59:44 +0000 (12:59 -0800)]
SDP: add return after SDP disconnection
A return is needed after sdp_disconnect(). It is the logic
expected and it prevents the use of p_ccb after it's freed.
Bug:
144177780
Bug:
117105007
Test: manual test
Change-Id: I7a64382b36adca37a8ff0c7e361d89ecdc8f3b55
(cherry picked from commit
30efc8c90a846460359a489e17e1461c725958b3)
Adam Seaton [Fri, 22 Nov 2019 19:29:41 +0000 (19:29 +0000)]
Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"
This reverts commit
9935f2ba7d9e78ff4c82bd3384960e27072a0b21.
Reason for revert: reverting due to functional regressions in Auto.
Bug:
144205318
Change-Id: I41dbcc0c5cb88dc72b13db2dd76e4751d7e98a6c
Adam Seaton [Fri, 22 Nov 2019 19:29:29 +0000 (19:29 +0000)]
Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"
This reverts commit
0d7723d147012c3141d259cce24745eb446ff1b1.
Reason for revert: reverting due to functional regressions in Auto.
Bug:
144205318
Change-Id: I96ec04beeb8eb4cb307f45c3c2a02d267c00c8fc
Adam Seaton [Fri, 22 Nov 2019 19:29:14 +0000 (19:29 +0000)]
Revert "Fix potential OOB write in btm_read_remote_ext_features_complete"
This reverts commit
33a71f2955f1254d2f96fd4a4d16d44463a21423.
Reason for revert: reverting due to functional regressions in Auto.
Bug:
144205318
Change-Id: I6e1d62f370fc910e91c0919dcb3f37fa2f3c7bf5
Venkata Jagadeesh Garaga [Thu, 18 Apr 2019 11:43:49 +0000 (17:13 +0530)]
GAP: Correct the continuous pkt length in l2cap
L2cap continuous pkt length wrongly calculated in
reassembly logic when remote sends more data
than expected.
Wrong pkt length leading to memory corruption
Hence the Correct the continuous pkt length in
l2cap reassembly logic.
Bug:
135239489
Bug:
143894715
CRs-Fixed:
2434229
Test: make and internal testing
Change-Id: I758d9e31465b99e436b9b1841320000f08186c97
Merged-In: I758d9e31465b99e436b9b1841320000f08186c97
(cherry picked from commit
337bd4579453bd6bf98ff519de3ac1019cd30d28)
Ted Wang [Wed, 6 Nov 2019 21:19:25 +0000 (13:19 -0800)]
[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev am:
981e2483c6 am:
4b700057ae -s ours
am:
b830f4e39c -s ours
am skip reason: change_id I3bd7349f382aa0e42123bbd835dcb60b77af099a with SHA1
9935f2ba7d is in history
Change-Id: I34998950f7353d3820099e30823abd371de06cf4
TreeHugger Robot [Wed, 6 Nov 2019 21:15:03 +0000 (21:15 +0000)]
Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into pi-dev
Ted Wang [Wed, 6 Nov 2019 21:13:44 +0000 (13:13 -0800)]
[automerger skipped] Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev am:
981e2483c6
am:
4b700057ae -s ours
am skip reason: change_id I3bd7349f382aa0e42123bbd835dcb60b77af099a with SHA1
0d7723d147 is in history
Change-Id: I4e3cea1e80f91d5a7789fa5305a1fafea6690a70
Ted Wang [Wed, 6 Nov 2019 21:08:00 +0000 (13:08 -0800)]
Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev
am:
981e2483c6
Change-Id: Iba00aec2298d8b6522555a56ba02b3dba5b7de3b
Ted Wang [Wed, 6 Nov 2019 18:08:13 +0000 (10:08 -0800)]
Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-mr1-dev
am:
82e29feb42
Change-Id: I6d685ffb735c1ff96224ec19d8eab569f4b2c2f2
TreeHugger Robot [Wed, 6 Nov 2019 17:55:06 +0000 (17:55 +0000)]
Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-dev
TreeHugger Robot [Wed, 6 Nov 2019 17:48:42 +0000 (17:48 +0000)]
Merge "Fix potential OOB write in btm_read_remote_ext_features_complete" into oc-mr1-dev
Ted Wang [Fri, 4 Oct 2019 10:39:02 +0000 (18:39 +0800)]
Fix potential OOB write in btm_read_remote_ext_features_complete
Add event length check to avoid hci event sent from controller not
correct.
Add page number check to avoid page number is bigger than max page
number.
Bug:
141552859
Test: inject function
Merged-In: I3bd7349f382aa0e42123bbd835dcb60b77af099a
Change-Id: I3bd7349f382aa0e42123bbd835dcb60b77af099a
Ted Wang [Fri, 4 Oct 2019 10:39:02 +0000 (18:39 +0800)]
Fix potential OOB write in btm_read_remote_ext_features_complete
Add event length check to avoid hci event sent from controller not
correct.
Add page number check to avoid page number is bigger than max page
number.
Bug:
141552859
Test: inject function
Merged-In: I3bd7349f382aa0e42123bbd835dcb60b77af099a
Change-Id: I3bd7349f382aa0e42123bbd835dcb60b77af099a
Nick Desaulniers [Wed, 16 Oct 2019 04:20:22 +0000 (21:20 -0700)]
[system][bt] fix -Wdangling-gsl am:
20ed45d633 am:
2f0c176bad
am:
2bcb84cd7d
Change-Id: I216e30fb5fb6ca5cadb7821d33825db4f197d087
Martin Brabham [Wed, 16 Oct 2019 03:10:24 +0000 (03:10 +0000)]
Merge "resolve merge conflicts of
26513d4a93ed51c4b3e3c8608a28cbc41aba79ba to pi-dev" into pi-dev
Nick Desaulniers [Tue, 15 Oct 2019 21:31:31 +0000 (14:31 -0700)]
[system][bt] fix -Wdangling-gsl am:
20ed45d633
am:
2f0c176bad
Change-Id: I82b0d0a3b21111b8711d58609c3f70f4637bc74b
Nick Desaulniers [Tue, 15 Oct 2019 21:24:30 +0000 (14:24 -0700)]
[system][bt] fix -Wdangling-gsl
am:
20ed45d633
Change-Id: I9f59103dc40ae2154a2b2314d309ba0f7184376a
Ted Wang [Fri, 4 Oct 2019 10:39:02 +0000 (18:39 +0800)]
Fix potential OOB write in btm_read_remote_ext_features_complete
Add event length check to avoid hci event sent from controller not
correct.
Add page number check to avoid page number is bigger than max page
number.
Bug:
141552859
Test: inject function
Merged-In: I3bd7349f382aa0e42123bbd835dcb60b77af099a
Change-Id: I3bd7349f382aa0e42123bbd835dcb60b77af099a
Nick Desaulniers [Thu, 10 Oct 2019 21:04:47 +0000 (14:04 -0700)]
[system][bt] fix -Wdangling-gsl
BtAddrString() returns a std::string. It's not safe to chain a call to
c_str() as otherwise the returned std::string is a temporary, and the
expression evaluates to an immediately dangling pointer.
Bug:
139945549
Bug:
142558228
Test: mm
Change-Id: I30972458abcc563b24ee0d80b289c3efd6c3e04d
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Martin Brabham [Wed, 2 Oct 2019 15:42:19 +0000 (08:42 -0700)]
resolve merge conflicts of
26513d4a93ed51c4b3e3c8608a28cbc41aba79ba to pi-dev
Test: I solemnly swear I tested this conflict resolution.
Bug:
110433804
Change-Id: I1ba3911607e587d13a69d2cfc4f8f905fe031141
Martin Brabham [Thu, 3 Oct 2019 15:58:42 +0000 (15:58 +0000)]
Merge "JustWorks: Auto-accept only incoming temporary pairing." into pi-dev
Martin Brabham [Thu, 20 Jun 2019 15:59:24 +0000 (08:59 -0700)]
JustWorks: Auto-accept only incoming temporary pairing.
Bug:
110433804
Bug:
134461862
Test: Manual; atest net_test_bluetooth
Change-Id: I4e3f39bc08e9d9493734a21ea29d76e43aeb50c8
Merged-In: I4e3f39bc08e9d9493734a21ea29d76e43aeb50c8
Jakub Pawlowski [Wed, 2 Oct 2019 13:04:38 +0000 (15:04 +0200)]
Fix read out of bounds in BtifAvEvent::DeepCopy
Bug:
140768453
Change-Id: Ia05e12382ef78a3e07228d09bcf9347f9976bffd
Martin Brabham [Wed, 2 Oct 2019 01:13:16 +0000 (18:13 -0700)]
JustWorks: Auto-accept only incoming temporary pairing. am:
10e15ee461
am:
103ba67ee2
Change-Id: I89a7a2650b3c4814a28c13a287722485d0b6eba7
Martin Brabham [Wed, 2 Oct 2019 01:06:15 +0000 (18:06 -0700)]
JustWorks: Auto-accept only incoming temporary pairing.
am:
10e15ee461
Change-Id: I392280bb44e2ab665baeab5ef5f1e6b9323fe463
Martin Brabham [Sat, 8 Jun 2019 04:58:52 +0000 (04:58 +0000)]
Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"
This reverts commit
26ba26be830f04e6fd9c77b075bcae48677d4cce.
Reason for revert: breaks tv UX
Bug:
110433804
Change-Id: I2c644ed62619f34494be0a0c7c75078cec0ebdd3