git.osdn.net Git - android-x86/system-bt.git/log

(root) / android-x86 / system-bt.git / log

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)"

commit | commitdiff | tree

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)"

commit | commitdiff | tree

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)"

commit | commitdiff | tree

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)"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 29 Nov 2018 11:51:37 +0000 (11:51 +0000)]

[automerger] Fix buffer overflow in btif_dm_data_copy am: d117975904 am: 12d8535d0f

Change-Id: I22ea297e564616790fd7e916747cdcea25d2b068

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 29 Nov 2018 11:51:34 +0000 (11:51 +0000)]

[automerger] Fix buffer overflow in btif_dm_data_copy am: d117975904

Change-Id: Icbd5b31039dbf3016575f9d6d69b216d76564c96

commit | commitdiff | tree

Jakub Pawlowski [Tue, 27 Nov 2018 16:59:57 +0000 (17:59 +0100)]

Fix buffer overflow in btif_dm_data_copy

When we use a union, we should always define variables as the union type,
not as one of the field subtypes. If the latter is cast to the union type,
buffer overflow can happen.

Bug: 110166268
Test: compilation
Change-Id: I473c03b099ad5a326e7a3739f65efd33cf4775bd
Merged-In: I473c03b099ad5a326e7a3739f65efd33cf4775bd

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 27 Nov 2018 16:47:48 +0000 (16:47 +0000)]

[automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am: 78508d2c2c am: a236f16071 am: 3f5af0aa65 am: 12557bb999

Change-Id: I1ecbacc502b14733b0f4bd11b057763506b1fd95

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 27 Nov 2018 16:47:45 +0000 (16:47 +0000)]

[automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am: 78508d2c2c am: a236f16071 am: 3f5af0aa65

Change-Id: I98ae5ab9e24acd447c0c72835067db0bc7430371

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 27 Nov 2018 16:47:42 +0000 (16:47 +0000)]

[automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am: 78508d2c2c am: a236f16071

Change-Id: I8615cedf8b9192c46506c54934229089021fe101

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 27 Nov 2018 16:47:40 +0000 (16:47 +0000)]

[automerger] Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm am: 78508d2c2c

Change-Id: If8da202c56ee7deeb7aba67f59b19ef28466f6ae

commit | commitdiff | tree

Jakub Pawlowski [Tue, 20 Nov 2018 21:31:31 +0000 (22:31 +0100)]

Fix potential usage of freed memory in btif_hl_proc_sdp_query_cfm

Bug: 116222069
Test: compilation
Change-Id: Iebe2c500dfc2806ca321fdcd170e20c680619d4d
Merged-In: Iebe2c500dfc2806ca321fdcd170e20c680619d4d

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 20 Nov 2018 09:11:21 +0000 (09:11 +0000)]

[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed am: 279c2a1910 am: c29c3aa408 am: 70ab44a424

Change-Id: I0ec2f3cf5ff12ff8953647dc4dbf254fa4573f8b

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 20 Nov 2018 09:11:18 +0000 (09:11 +0000)]

[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed am: 279c2a1910 am: c29c3aa408

Change-Id: I08534e15fd3a1ac53d666a9d27b6f3a30200e065

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 20 Nov 2018 09:11:15 +0000 (09:11 +0000)]

[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed am: 279c2a1910

Change-Id: Ie051800f6ad61b7f7d14dd41f56b19848f38e5fb

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 20 Nov 2018 09:11:11 +0000 (09:11 +0000)]

[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: edd7e731ed

Change-Id: I1db76ed30b73630aa44839271fbb654ce533c17c

commit | commitdiff | tree

Ugo Yu [Tue, 30 Oct 2018 07:10:35 +0000 (15:10 +0800)]

DO NOT MERGE Separate SDP procedure from bonding state (1/2)

- Do not stay in bonding state if the device is paried but still
  discovering service.
- Report BOND_BONDED to Java after authentication is completed.
- Report empty UUID to Java if a classic Bluetooth device SDP
  failed while pairing.
- Hold BOND_BONDED intent util SDP is findished.
- Only accept profile connection for the device is at bonded
  state. Any attempt to connect while bonding would potentially
  lead to an unauthorized connection.

Bug: 79703832
Test: runtest bluetooth, regression test.
Change-Id: I023713e07308bfc0e5bb8d67f386bcc50f6a0f85
(cherry picked from commit 122e115b87fe98ca5e5e65b9765c146f9e52b65e)

commit | commitdiff | tree

Hansong Zhang [Mon, 5 Nov 2018 18:03:36 +0000 (18:03 +0000)]

Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:28 +0000 (18:01 +0000)]

[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped: 163dec2ae1 skipped: 9805ed7a7a skipped: f9606e1d89 skipped: c96313fb2c

Change-Id: I29b39b9cd2b0390289b525bf50ce4080b4a9557a

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:27 +0000 (18:01 +0000)]

[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped: 163dec2ae1 skipped: 9805ed7a7a skipped: f9606e1d89

Change-Id: Iee0814f1ed5a5decc214abad4721a84825cd53b1

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:26 +0000 (18:01 +0000)]

[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped: 163dec2ae1 skipped: 9805ed7a7a

Change-Id: I5977408e04b4479c9aa2b5d16a03e18d7e9deced

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:25 +0000 (18:01 +0000)]

[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped: 163dec2ae1

Change-Id: I406dd66fa46d18b70d48faedf810d6a3ddbe3fbc

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Nov 2018 17:16:34 +0000 (17:16 +0000)]

Merge "DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Nov 2018 17:16:34 +0000 (17:16 +0000)]

Merge changes from topic "am-154171ba-0805-48c6-88cf-c592ee3cf37c" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8 am: 13e8d7ad1c am: d474c386ef
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8 am: 13e8d7ad1c
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981
  DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Nov 2018 17:16:34 +0000 (17:16 +0000)]

Merge changes from topic "am-154171ba-0805-48c6-88cf-c592ee3cf37c" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8 am: 13e8d7ad1c
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981
  DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Nov 2018 17:16:34 +0000 (17:16 +0000)]

Merge changes from topic "am-154171ba-0805-48c6-88cf-c592ee3cf37c" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981 am: 9172befdc8
  [automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981
  DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act

commit | commitdiff | tree

TreeHugger Robot [Mon, 5 Nov 2018 17:16:34 +0000 (17:16 +0000)]

Merge changes from topic "am-154171ba-0805-48c6-88cf-c592ee3cf37c" into nyc-dr1-dev

* changes:
[automerger] DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act am: a4a11e1981
DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Nov 2018 00:37:33 +0000 (00:37 +0000)]

Merge changes from topic "Check-AT-command-buffer-boundary-during-parsing" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am: aea10aec7f am: 289b3fa863
  [automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am: aea10aec7f
  DO NOT MERGE HFP: Check AT command buffer boundary during parsing

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Nov 2018 00:37:33 +0000 (00:37 +0000)]

Merge changes from topic "Check-AT-command-buffer-boundary-during-parsing" into cw-f-dev

* changes:
[automerger] DO NOT MERGE HFP: Check AT command buffer boundary during parsing am: aea10aec7f
DO NOT MERGE HFP: Check AT command buffer boundary during parsing

commit | commitdiff | tree

TreeHugger Robot [Sat, 3 Nov 2018 00:37:33 +0000 (00:37 +0000)]

Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into nyc-mr1-dev

commit | commitdiff | tree