OSDN Git Service
Android Build Merger (Role) [Thu, 30 May 2019 16:56:02 +0000 (16:56 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc am:
a52bfe5e60 skipped:
58d5d4b7f7
Change-Id: I2e5ee164ea33bc6f845e34bc39a24f0080d9bbe9
Android Build Merger (Role) [Thu, 30 May 2019 16:55:59 +0000 (16:55 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc am:
a52bfe5e60
Change-Id: I8d3abdacbf67c5f8cbd1cf3b1fb63528b4a95811
Android Build Merger (Role) [Thu, 30 May 2019 16:55:56 +0000 (16:55 +0000)]
[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:
dff6cd84bc
Change-Id: I3d8a71cad06115d2be87a8c8a6b961ffa2827709
Martin Brabham [Wed, 29 May 2019 19:16:59 +0000 (12:16 -0700)]
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Bug:
110433804
Test: Manual; atest net_test_bluetooth
Change-Id: I84d50604dee67a01855228c72bb7e8d484de951c
Android Build Merger (Role) [Tue, 28 May 2019 19:22:47 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512 skipped:
d1443d1913
Change-Id: I48d0148eb1a45e93105b3baf6a42ba91221fc402
Android Build Merger (Role) [Tue, 28 May 2019 19:22:45 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf am:
c366796512
Change-Id: I1f9eb6a5010e8ffef7b7e0912b7f6ce81067ccec
Android Build Merger (Role) [Tue, 28 May 2019 19:22:44 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462 am:
9722c18caf
Change-Id: I040da3eb560786454a69d3230cf7d559a98c9818
Android Build Merger (Role) [Tue, 28 May 2019 19:22:42 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9 am:
bb3fc48462
Change-Id: I5af312e49f6c6440ae31d8bb55d1ed3311a46e43
Android Build Merger (Role) [Tue, 28 May 2019 19:22:40 +0000 (19:22 +0000)]
[automerger] DO NOT MERGE Send HCI Read Encryption Key properly am:
a3cc7575f9
Change-Id: Id63bf05a79287ec45942647075c715e858f915d1
Jakub Pawlowski [Fri, 24 May 2019 20:01:09 +0000 (22:01 +0200)]
DO NOT MERGE Send HCI Read Encryption Key properly
This patch fixes bad HCI command being send instead of Read Encryption
Key Size.
Bug:
124301137
Test: pair and connect with Bluetooth headset
Change-Id: If325ef2771ca1546ae58df7c684f66ae537b8573
TreeHugger Robot [Thu, 9 May 2019 20:20:23 +0000 (20:20 +0000)]
Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into oc-dev
TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into nyc-mr2-dev
* changes:
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into cw-f-dev
* changes:
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into nyc-mr1-dev
* changes:
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into nyc-dr1-dev
* changes:
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]
Merge "Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"" into nyc-dev
TreeHugger Robot [Thu, 9 May 2019 18:49:48 +0000 (18:49 +0000)]
Merge changes from topic "am-
52079082-d7b1-4194-aa18-
1c17fa700e34" into oc-dev
* changes:
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0 skipped:
a328e6dc05
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
TreeHugger Robot [Wed, 8 May 2019 16:30:02 +0000 (16:30 +0000)]
Merge "DO NOT MERGE: osi: Offload mutex pointer to local scope" into oc-dev
TreeHugger Robot [Wed, 8 May 2019 03:35:08 +0000 (03:35 +0000)]
Merge "Fix potential OOB read in sdpu_get_len_from_type" into oc-dev
Martin Brabham [Thu, 4 Apr 2019 21:57:41 +0000 (14:57 -0700)]
DO NOT MERGE: osi: Offload mutex pointer to local scope
Create a shared_ptr for the callback_mutex in the alarm struct.
When performing the callback, make a local shared_ptr reference.
lock_guard on the local shared_ptr reference.
Bug:
117997080
Test: atest net_test_bluetooth
Change-Id: Iab800f720f4ccc4735e4d494e0d458eb97b40a4a
Android Build Merger (Role) [Mon, 6 May 2019 05:57:02 +0000 (05:57 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70 skipped:
d691b2dd00
Change-Id: I12681b184de3aaff511fcf29540b6cde73bc6ac2
Android Build Merger (Role) [Mon, 6 May 2019 05:56:59 +0000 (05:56 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041 am:
9683021f70
Change-Id: I91346a746ce3342fc02c6a8afa82ed1904b374d7
Android Build Merger (Role) [Mon, 6 May 2019 05:56:54 +0000 (05:56 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe am:
e26c142041
Change-Id: I8f91d03ebd8ce528acf076443400daed71b261aa
Android Build Merger (Role) [Mon, 6 May 2019 05:56:49 +0000 (05:56 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe am:
d887336efe
Change-Id: I854858463801fabb6b21bc6af67d794387c36b3e
Android Build Merger (Role) [Mon, 6 May 2019 05:56:45 +0000 (05:56 +0000)]
[automerger] DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type am:
08202bdcbe
Change-Id: I79d94e8ba10a1f8e5f1657eaab36eacab4c6d0fb
Ted Wang [Mon, 29 Apr 2019 02:11:04 +0000 (10:11 +0800)]
DO NOT MERGE Fix potential OOB read in sdpu_get_len_from_type
Add boundary check in sdpu_get_len_from_type to prevent potential OOB read.
Bug:
117105007
Test: Manul
Merged-In: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Change-Id: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Ted Wang [Mon, 29 Apr 2019 02:11:04 +0000 (10:11 +0800)]
Fix potential OOB read in sdpu_get_len_from_type
Add boundary check in sdpu_get_len_from_type to prevent potential OOB read.
Bug:
117105007
Test: Manul
Merged-In: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
Change-Id: I3755e13ee0a7e22ffd5f48fca909610a26b09d0a
(cherry picked from commit
1243f8da338dadfe2a3c281a08297b431402d41c)
Myles Watson [Wed, 1 May 2019 18:31:36 +0000 (18:31 +0000)]
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
This reverts commit
09894418589479875443037c45e596824da90928.
Bug:
79703832
Bug:
130553855
Reason for revert: Regression with cross-key pairing
Change-Id: Idb732736c250a8ed375cce4f7b27669542ea70e2
Merged-In: If8652936eb3b24b3d1b3fded0be200bb986b70e3
Android Build Merger (Role) [Wed, 1 May 2019 18:28:23 +0000 (18:28 +0000)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0 skipped:
a328e6dc05
Change-Id: I7751a160ac79d810e5e8f2a545f7887ab2cfe756
Android Build Merger (Role) [Wed, 1 May 2019 18:28:22 +0000 (18:28 +0000)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb am:
2f19a132c0
Change-Id: Ifc01741e99c7912c459ee9178c1c8533599df240
Android Build Merger (Role) [Wed, 1 May 2019 18:28:20 +0000 (18:28 +0000)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b am:
81488162eb
Change-Id: If67e79b47e46c5808dff364e9a51da247e2c82f3
Android Build Merger (Role) [Wed, 1 May 2019 18:28:18 +0000 (18:28 +0000)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732 am:
ea5e81480b
Change-Id: Idd6c2e065049ae432ecc44069c4344c97e46d8de
Android Build Merger (Role) [Wed, 1 May 2019 18:28:16 +0000 (18:28 +0000)]
[automerger] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" am:
eed7f80732
Change-Id: I1a5218347cd6039a1aa48f304a55e2cce6b5d179
Myles Watson [Wed, 1 May 2019 18:28:13 +0000 (18:28 +0000)]
Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
This reverts commit
edd7e731edad067fe08b0623be6b2745bf81a445.
Bug:
79703832
Bug:
130553855
Reason for revert: Regression with cross-key pairing
Change-Id: I78f523b930d1433e39fc900d703f2317518a8b39
Jakub Pawlowski [Mon, 11 Mar 2019 18:22:01 +0000 (19:22 +0100)]
DO NOT MERGE Don't persist bonds using sample LTK
Test: compilation, manual testing
Bug:
128843052
Merged-In: I52fd484d42bf87e96dbc9e6456090f231ed48111
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111
Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:30 +0000 (18:14 +0000)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e skipped:
05e4e07328
Change-Id: Ia5e85f456ba202b1562b8f6fc2f3481f7a999691
Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:23 +0000 (18:14 +0000)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d am:
1dec8a9f3e
Change-Id: I6d433ec513e6f04b8e117a08a9ce5bebdd42d8d4
Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:19 +0000 (18:14 +0000)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68 am:
0fd5b5de7d
Change-Id: Idf19ab0fdf1da993701a6b24d47fccc982f3e2ff
Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:16 +0000 (18:14 +0000)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9 am:
c544656a68
Change-Id: I21c8af012049cbf87adc90f1e3e46f47baddbca5
Android Build Merger (Role) [Mon, 1 Apr 2019 18:14:13 +0000 (18:14 +0000)]
[automerger] DO NOT MERGE Don't persist bonds using sample LTK am:
c0fb2a25f9
Change-Id: I2a44d852ccb88db0bf360ae094d240ca64e50a94
Jakub Pawlowski [Mon, 11 Mar 2019 18:22:01 +0000 (19:22 +0100)]
DO NOT MERGE Don't persist bonds using sample LTK
Test: compilation, manual testing
Bug:
128843052
Change-Id: I52fd484d42bf87e96dbc9e6456090f231ed48111
Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]
DO NOT MERGE Drop Bluetooth connection with weak encryption key
This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.
Bug:
124301137
Merged-In: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
Change-Id: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
Android Build Merger (Role) [Fri, 22 Mar 2019 18:30:05 +0000 (18:30 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2 skipped:
f0213c3937
Change-Id: I028d493ce2aae117a28422b68df67dd424b28148
Android Build Merger (Role) [Fri, 22 Mar 2019 18:30:03 +0000 (18:30 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2
Change-Id: I203993fecd15608d036b79ae9f1bcf1e6e5536b1
Android Build Merger (Role) [Fri, 22 Mar 2019 18:30:01 +0000 (18:30 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e
Change-Id: Iebe131904b01492285eaaeaf6408b76037b2643e
Android Build Merger (Role) [Fri, 22 Mar 2019 18:29:58 +0000 (18:29 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86
Change-Id: Ia0fb7cb6c331f4f30b4a2320fa52b66be425c74f
Android Build Merger (Role) [Fri, 22 Mar 2019 18:29:56 +0000 (18:29 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367
Change-Id: I4fb660ac5ca288993e6f0643929eb1b1def1040c
Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]
DO NOT MERGE Drop Bluetooth connection with weak encryption key
This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.
Bug:
124301137
Change-Id: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
TreeHugger Robot [Thu, 7 Mar 2019 23:04:58 +0000 (23:04 +0000)]
Merge "DO NOT MERGE Fix length for L2CAP config type EXT FLOW" into nyc-dev
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:47 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce skipped:
3c413e34d2
Change-Id: I5f0ad541fa702233322b96e5dd5c9d53233dea94
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:45 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce
Change-Id: I6e56a6c02e5d7a3e23832c8e24550ae626a4dc6a
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:43 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c
Change-Id: I747585195e3cf9137449dc777b64174a4a93c1f3
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:42 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178
Change-Id: Ie35b3f093063898bc9d8cab84d221194f1ca007b
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:38 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe
Change-Id: I24f0d31be7582e28ba9b96d836cd85bcf7f3ef4c
Hansong Zhang [Thu, 7 Mar 2019 18:50:04 +0000 (10:50 -0800)]
DO NOT MERGE Fix length for L2CAP config type EXT FLOW
Bug:
119870451
Test: POC
Change-Id: I11041dd03caad5569e930ff36b50fc9c2719c57f
TreeHugger Robot [Fri, 8 Feb 2019 20:19:42 +0000 (20:19 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into nyc-dev
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408 am:
70ab44a424
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into cw-f-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into oc-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408 am:
70ab44a424 skipped:
4e26a1fa5d
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408 am:
70ab44a424
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
TreeHugger Robot [Fri, 8 Feb 2019 00:31:40 +0000 (00:31 +0000)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge "DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed" into nyc-dev
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c am:
90265d4ee0
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce
DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into cw-f-dev
* changes:
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce
DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce
DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce
DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into oc-dev
* changes:
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c am:
90265d4ee0 skipped:
84ba34d57a
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c am:
90265d4ee0
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce
DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed
TreeHugger Robot [Sat, 2 Feb 2019 07:52:13 +0000 (07:52 +0000)]
Merge "DO NOT MERGE process_l2cap_cmd: Fix OOB" into nyc-dev
TreeHugger Robot [Sat, 2 Feb 2019 07:52:13 +0000 (07:52 +0000)]
Merge changes from topic "am-
cdd47550-8877-443a-826f-
db2b25d750ce" into oc-dev
* changes:
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e am:
53e323b2af am:
d0584f3dcf skipped:
55b702e6c4
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e am:
53e323b2af am:
d0584f3dcf
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e am:
53e323b2af
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93
DO NOT MERGE process_l2cap_cmd: Fix OOB
TreeHugger Robot [Fri, 1 Feb 2019 23:18:22 +0000 (23:18 +0000)]
Merge "process_l2cap_cmd: Fix OOB" into oc-dev
TreeHugger Robot [Wed, 30 Jan 2019 00:25:28 +0000 (00:25 +0000)]
Merge "btm_ble_multi_adv: Check data length in HCI interface" into oc-dev
Android Build Merger (Role) [Tue, 22 Jan 2019 21:47:38 +0000 (21:47 +0000)]
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c am:
90265d4ee0 skipped:
84ba34d57a
Change-Id: I73f54778128ee9bf1ed46c55bbd545b29ed2dc54
Android Build Merger (Role) [Tue, 22 Jan 2019 21:47:36 +0000 (21:47 +0000)]
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c am:
90265d4ee0
Change-Id: I080739b77c52af5ff54bfc4e8a20cf8fd52b235b
Android Build Merger (Role) [Tue, 22 Jan 2019 21:47:35 +0000 (21:47 +0000)]
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c
Change-Id: Ic43337c91c1cdcb9eaea22311cd7205dc05dcfa2
Hansong Zhang [Thu, 10 Jan 2019 02:18:17 +0000 (18:18 -0800)]
btm_proc_smp_cback: Don't access p_dev_rec if freed
In btm_proc_smp_cback(), return after p_dev_rec is freed in the middle
to prevent use after free
Bug:
120612744
Test: Use ASAN build; connect to a LE device and wait for timeout
Change-Id: Ic9d0eaeb62a1a1b24884146ca82f4104fabc5bac
Android Build Merger (Role) [Tue, 22 Jan 2019 21:47:33 +0000 (21:47 +0000)]
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2
Change-Id: I96de72b97a23eebad116c98899f59f399614cff7
Android Build Merger (Role) [Tue, 22 Jan 2019 21:47:32 +0000 (21:47 +0000)]
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce
Change-Id: Iad8449f422afb55305d3f1f2a148a4122c49c7d8
Hansong Zhang [Tue, 22 Jan 2019 21:46:47 +0000 (13:46 -0800)]
DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed
In btm_proc_smp_cback(), return after p_dev_rec is freed in the middle
to prevent use after free
Bug:
120612744
Test: Use ASAN build; connect to a LE device and wait for timeout
Change-Id: I09aa1cf1d1c835146b62d0f4989aeedfb885d95b
Android Build Merger (Role) [Tue, 22 Jan 2019 18:47:24 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e am:
53e323b2af am:
d0584f3dcf skipped:
55b702e6c4
Change-Id: If1fb97bc56d2ed652f56f1f962aea1d00843543e
Android Build Merger (Role) [Tue, 22 Jan 2019 18:47:22 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e am:
53e323b2af am:
d0584f3dcf
Change-Id: I101a465864f054989085bba0ccf2fc633445f356
Android Build Merger (Role) [Tue, 22 Jan 2019 18:47:20 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e am:
53e323b2af
Change-Id: I9a919a3168f0d37834a14778c3f24f1e5f417685
Android Build Merger (Role) [Tue, 22 Jan 2019 18:47:18 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93 am:
14f6578d9e
Change-Id: I1df2130c25d9399d2c6ebc47bc0b8ec127994b89
Android Build Merger (Role) [Tue, 22 Jan 2019 18:47:16 +0000 (18:47 +0000)]
[automerger] DO NOT MERGE process_l2cap_cmd: Fix OOB am:
38f07a3c93
Change-Id: I89bb716ce51a1d98147c0df527174b4934999347
Hansong Zhang [Fri, 18 Jan 2019 19:51:00 +0000 (11:51 -0800)]
DO NOT MERGE process_l2cap_cmd: Fix OOB
Bug:
119870451
Test: POC
Change-Id: Ieef322a3ad4cebcaf40e5388584d3a04a4761d2e
Hansong Zhang [Mon, 14 Jan 2019 22:59:35 +0000 (14:59 -0800)]
process_l2cap_cmd: Fix OOB
Bug:
119870451
Test: POC
Change-Id: I2f5e7fedd9aed96c4ffc55af79fdac61c2e5b087
Merged-In: I5131bbf9cda6248fdbbc4bb91916b2fe3731246e
Hansong Zhang [Wed, 16 Jan 2019 20:33:26 +0000 (12:33 -0800)]
btm_ble_multi_adv: Check data length in HCI interface
For BleAdvertiserVscHciInterfaceImpl and
BleAdvertiserLegacyHciInterfaceImpl, the maximum size of scan response
and advertising packet data length should be BTM_BLE_AD_DATA_LEN (31).
Bug:
121145627
Test: POC
Change-Id: I7653a6c186b7313ef2b1547bca120b9d41c90140
TreeHugger Robot [Mon, 7 Jan 2019 22:33:36 +0000 (22:33 +0000)]
Merge "DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu" into oc-dev
Stanley Tng [Tue, 11 Dec 2018 22:45:13 +0000 (14:45 -0800)]
DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu
Add check to make sure that data buffer is big enough to read the 2
bytes for length.
Also, fix a regression from the previous CL that checks the buffer length
before doing a memcpy. The previous check is too strict causing valid
sized buffers to be rejected. The length check is incorrect and off by the header size.
Bug:
120665616
Test: Run the SL4A Test for LE CoC, BleCoCTest
Merged-In: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
Change-Id: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
(cherry picked from commit
fcb1994de1f6ee34b8dc6804a2b32e20bf138073)
(cherry picked from commit
1f1d8b97d80d25023c4c7b04d2aa18d367f4158d)
(cherry picked from commit
6b2739f309f7719086eb8201b3e1a35ba60035f4)
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:29 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0 skipped:
dff13d810c
Change-Id: I92b4d78f5b6a53c863e7ec6d91b4cc32982258f8
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:28 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88 am:
2ebe3d52b0
Change-Id: I0cbec621cadfaaf9142d427b52a17cd9db3cd08a
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:27 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31 am:
097ecf3d88
Change-Id: I9fd0733ff10442ca2050e440b954a9cb2f574c1a
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:26 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508 am:
85b4574a31
Change-Id: I40ce009c5868fde902bc29a0af1b62c89f02f158
Android Build Merger (Role) [Sun, 6 Jan 2019 21:36:24 +0000 (21:36 +0000)]
[automerger] DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu am:
c1fcbd5508
Change-Id: I5812786ed1ac013a273e300c1ddbe3fd26857543
Stanley Tng [Tue, 11 Dec 2018 22:45:13 +0000 (14:45 -0800)]
DO NOT MERGE A security fix to check buffer length in l2c_lcc_proc_pdu
Add check to make sure that data buffer is big enough to read the 2
bytes for length.
Also, fix a regression from the previous CL that checks the buffer length
before doing a memcpy. The previous check is too strict causing valid
sized buffers to be rejected. The length check is incorrect and off by the header size.
Bug:
120665616
Test: Run the SL4A Test for LE CoC, BleCoCTest
Merged-In: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
Change-Id: I30b7a8af11d3a5f974cb39e06b0e3463bebc8e9a
(cherry picked from commit
fcb1994de1f6ee34b8dc6804a2b32e20bf138073)
(cherry picked from commit
1f1d8b97d80d25023c4c7b04d2aa18d367f4158d)
(cherry picked from commit
6b2739f309f7719086eb8201b3e1a35ba60035f4)
Ugo Yu [Tue, 13 Nov 2018 12:03:28 +0000 (20:03 +0800)]
Add OOB check in avrc_pars_browse_rsp
Bug:
111451066
Test: Manully
Change-Id: I068d218b8957bb8f053148d252a9119a8def28cc
Android Build Merger (Role) [Thu, 29 Nov 2018 11:52:36 +0000 (11:52 +0000)]
[automerger] Fix buffer overflow in btif_dm_data_copy am:
d117975904 am:
12d8535d0f am:
98ced409a5 am:
c75667da96 skipped:
89e9bbb83c
Change-Id: Ia431ddd5ad1d6ee86bd6edd1057372b8dbf51d3b
Android Build Merger (Role) [Thu, 29 Nov 2018 11:51:42 +0000 (11:51 +0000)]
[automerger] Fix buffer overflow in btif_dm_data_copy am:
d117975904 am:
12d8535d0f am:
98ced409a5 am:
c75667da96
Change-Id: I0e5f1348f27f0d9981f99cc0897f9dcc9f443bf3
Android Build Merger (Role) [Thu, 29 Nov 2018 11:51:39 +0000 (11:51 +0000)]
[automerger] Fix buffer overflow in btif_dm_data_copy am:
d117975904 am:
12d8535d0f am:
98ced409a5
Change-Id: I258a6e883061d68b24b30e17e03f72d2000e5f3f
OSDN Git Service
