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

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

Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:17 +0000 (03:48 +0000)]

[automerger] Add checks whether the AVDTP element data length is valid am: e192c988cb am: 6b2f63f880 am: ac8793939a

Change-Id: Ibde13c7a9f0af5a7e4f38db226532780b8fc50fa

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:15 +0000 (03:48 +0000)]

[automerger] Add checks whether the AVDTP element data length is valid am: e192c988cb am: 6b2f63f880

Change-Id: I874adb503bb51f88ad7a934b697221f544fc5488

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:12 +0000 (03:48 +0000)]

[automerger] Add checks whether the AVDTP element data length is valid am: e192c988cb

Change-Id: I945a8ce34b41a7df4a3c853ad5b4ba51d0136251

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 31 May 2018 17:23:02 +0000 (10:23 -0700)]

Add checks whether the AVDTP element data length is valid

Bug: 78288378
Test: Manual: Python script and extra logging
Change-Id: I576d798d8b566946a3f2d973cb9d4e8dbd22d09e
Merged-In: I715b5977c833d33ff798f008fbf244effa13ea1f

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:05 +0000 (23:10 +0000)]

[automerger] BNEP: Fix OOB access in bnep_data_ind am: 0bd01271c4 am: 8f9b349c23 am: 81dcda9a5a

Change-Id: I1cd6cf2b54334cff0bb8568cb0dd5ef6121ca444

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:03 +0000 (23:10 +0000)]

[automerger] BNEP: Fix OOB access in bnep_data_ind am: 0bd01271c4 am: 8f9b349c23

Change-Id: I404328203b34b5e48d2d5fbca3667e9dac9ca742

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:01 +0000 (23:10 +0000)]

[automerger] BNEP: Fix OOB access in bnep_data_ind am: 0bd01271c4

Change-Id: I12f77728b3ad0f10b3cd0f34a7068272573e6ea4

commit | commitdiff | tree

Jack He [Fri, 1 Jun 2018 21:00:42 +0000 (14:00 -0700)]

BNEP: Fix OOB access in bnep_data_ind

* Stop reading the L2CAP packet if packet length is 0
* Process the buffer for BNEP_EXTENSION_CONTROL packet before advancing
  the buffer pointer by length of payload
* Reject BNEP_EXTENSION_CONTROL packet when the payload size is zero
* Move error logging to more appropriate locations at where the OOB access
  is most likely triggered

Bug: 78286118
Bug: 79164722
Test: Send zero length L2CAP packet to BNEP, send invalid
      BNEP_EXTENSION_CONTROL packet
Change-Id: I7e18632b8faab1b6aaca1bff1b7f55d69962729e
Merged-In: I7e18632b8faab1b6aaca1bff1b7f55d69962729e
(cherry picked from commit 3c799a6e25abdf6bacb660ff7a06338836cc7356)

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:21 +0000 (19:11 +0000)]

[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: 0a8453ba41 am: f60bc5a9a8 am: 9619144b16

Change-Id: I164001793fe32ef903c430594d93dc800e8c396f

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:19 +0000 (19:11 +0000)]

[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: 0a8453ba41 am: f60bc5a9a8

Change-Id: I36cca997401a549ed94036dd48efa7ba00d73fd4

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:17 +0000 (19:11 +0000)]

[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: 0a8453ba41

Change-Id: I9a8fc8c90e84297bde904dc30c31c745e0e15cbd

commit | commitdiff | tree

akirilov [Fri, 27 Apr 2018 22:05:14 +0000 (15:05 -0700)]

Fixes two bluetooth bugs causing remote overreads (2/2)

Bug: 74075873
Test: manual

Change-Id: I28a78084a1ab451b407ee6e7a5495c1e43ed757b
Merged-In: I76058b11c90dc40b78f26fb64b74d609f3473f5d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 31 May 2018 22:59:10 +0000 (22:59 +0000)]

[automerger] Decrease length after reading from array in process_service_attr_req am: 76e962892e am: 7c0954970d am: a2c06775c0

Change-Id: I299635da00bbe1bbe165fadc6d585eeaa2518782

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 31 May 2018 22:59:09 +0000 (22:59 +0000)]

[automerger] Decrease length after reading from array in process_service_attr_req am: 76e962892e am: 7c0954970d

Change-Id: I1de298ca18d15b94345fb616de4688b952a06dce

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 31 May 2018 22:59:07 +0000 (22:59 +0000)]

[automerger] Decrease length after reading from array in process_service_attr_req am: 76e962892e

Change-Id: I32728f7171047fc39b6d166bd6e13be053542c51

commit | commitdiff | tree

Jakub Pawlowski [Tue, 29 May 2018 23:25:56 +0000 (16:25 -0700)]

Decrease length after reading from array in process_service_attr_req

Test: compilation
Bug: 78136677
Change-Id: I4807a350e2b4764a93f104ce88f23a957a7e85c0
Merged-In: I4807a350e2b4764a93f104ce88f23a957a7e85c0

commit | commitdiff | tree

Atanas Kirilov [Thu, 31 May 2018 22:04:35 +0000 (22:04 +0000)]

Merge changes from topic "am-0ee00745-3175-4746-9daa-2f8a6e252eaa" into mnc-dr1.5-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd am: 222339b17e am: c8367854c7
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd am: 222339b17e
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd
  RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)

commit | commitdiff | tree

Atanas Kirilov [Thu, 31 May 2018 22:04:35 +0000 (22:04 +0000)]

Merge changes from topic "am-0ee00745-3175-4746-9daa-2f8a6e252eaa" into cw-e-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd am: 222339b17e
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd
  RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)

commit | commitdiff | tree

Atanas Kirilov [Thu, 31 May 2018 22:04:35 +0000 (22:04 +0000)]

Merge changes from topic "am-0ee00745-3175-4746-9daa-2f8a6e252eaa" into mnc-dr-dev

* changes:
[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd
RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)

commit | commitdiff | tree

Atanas Kirilov [Thu, 31 May 2018 22:04:35 +0000 (22:04 +0000)]

Merge "RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)" into mnc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 31 May 2018 21:17:08 +0000 (21:17 +0000)]

Merge changes from topic "am-f4bfe0c3-4263-420c-abf9-a0e5b20986ff" into mnc-dr1.5-dev

* changes:
  [automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am: 89f6f14938 am: 1ded57e67f am: f078bbf975
  [automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am: 89f6f14938 am: 1ded57e67f
  [automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am: 89f6f14938
  DO NOT MERGE: SDP: Recalculate param_len after max_list_len

commit | commitdiff | tree

TreeHugger Robot [Thu, 31 May 2018 21:17:08 +0000 (21:17 +0000)]

Merge changes from topic "am-f4bfe0c3-4263-420c-abf9-a0e5b20986ff" into cw-e-dev

* changes:
  [automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am: 89f6f14938 am: 1ded57e67f
  [automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am: 89f6f14938
  DO NOT MERGE: SDP: Recalculate param_len after max_list_len

commit | commitdiff | tree

TreeHugger Robot [Thu, 31 May 2018 21:17:08 +0000 (21:17 +0000)]

Merge changes from topic "am-f4bfe0c3-4263-420c-abf9-a0e5b20986ff" into mnc-dr-dev

* changes:
[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am: 89f6f14938
DO NOT MERGE: SDP: Recalculate param_len after max_list_len

commit | commitdiff | tree

TreeHugger Robot [Thu, 31 May 2018 21:17:08 +0000 (21:17 +0000)]

Merge "DO NOT MERGE: SDP: Recalculate param_len after max_list_len" into mnc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 31 May 2018 17:41:13 +0000 (17:41 +0000)]

Merge "DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event" into mnc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 30 May 2018 17:54:27 +0000 (17:54 +0000)]

[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am: 89f6f14938 am: 1ded57e67f am: f078bbf975

Change-Id: I930a5cfd8ddecf3782b878d307aa576e47f49164

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 30 May 2018 17:54:26 +0000 (17:54 +0000)]

[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am: 89f6f14938 am: 1ded57e67f

Change-Id: I7c1149eb4ace84dd30921e2d77b0e413540c1e98

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 30 May 2018 17:54:24 +0000 (17:54 +0000)]

[automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am: 89f6f14938

Change-Id: I3fc3934d98a3d29f14f13246241ae2eff030972d

commit | commitdiff | tree

Myles Watson [Tue, 29 May 2018 23:55:58 +0000 (16:55 -0700)]

DO NOT MERGE: SDP: Recalculate param_len after max_list_len

Bug: 78136869
Test: manual connection to an A2DP device
Change-Id: I71392cf1a70567fec957feb36768069ac5258aa1
(cherry picked from commit ef7dddabbd70222fa0fafc97e8562d977f550d26)

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 30 May 2018 00:36:36 +0000 (00:36 +0000)]

[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am: cf33d63af8 am: 9b0d9ee8fc am: 3df5904c55

Change-Id: I527c4a73512f47727d75144c904e2baffa409974

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 30 May 2018 00:36:34 +0000 (00:36 +0000)]

[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am: cf33d63af8 am: 9b0d9ee8fc

Change-Id: I9997b7d81fbaaf71cc2c79b0f6d1e81981e56daa

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 30 May 2018 00:36:32 +0000 (00:36 +0000)]

[automerger] DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event am: cf33d63af8

Change-Id: Ief4df7632af850dd7a2caa80046855644aa2df6d

commit | commitdiff | tree

Hansong Zhang [Wed, 30 May 2018 00:35:01 +0000 (17:35 -0700)]

DO NOT MERGE SMP: Check p_cb->role in smp_br_state_machine_event

Bug: 80145946
Test: manual
Change-Id: Ic83eaa4be868d5a345d80cd50a6915c0af719a53

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 26 May 2018 07:29:15 +0000 (07:29 +0000)]

[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2 am: bdcc61da11

Change-Id: I43e8c151fffa381413347fa2429b4a996f432199

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 26 May 2018 07:29:14 +0000 (07:29 +0000)]

[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2

Change-Id: I3edb3cd03b07aa7dba92f6d90026dd1c1e8d3b6b

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 26 May 2018 07:29:12 +0000 (07:29 +0000)]

[automerger] GATT: Handle too short Error Response PDU am: 03881d1055

Change-Id: I1d7cb68481b798a0f59b8b8bdf6639f5fb1c5fea

commit | commitdiff | tree

Jakub Pawlowski [Wed, 23 May 2018 17:30:19 +0000 (10:30 -0700)]

GATT: Handle too short Error Response PDU

Since the spec is not clear what to do in this case, use one of
reserved error codes as a failure reason, and pass it to upper layers.

Bug: 79591688
Change-Id: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f
Merged-In: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 26 May 2018 02:50:23 +0000 (02:50 +0000)]

[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d am: ab7f755c9d am: c8a02c4bd8

Change-Id: Ib296956f3e5ff59ed7f02d61dcc6bf93e572c58f

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 26 May 2018 02:50:21 +0000 (02:50 +0000)]

[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d am: ab7f755c9d

Change-Id: Ib45cb979df156f9871bbe845dcd12d291681035e

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 26 May 2018 02:50:19 +0000 (02:50 +0000)]

[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d

Change-Id: Ib457d90751151790f92abe23b38596c02f0a69af

commit | commitdiff | tree

Jakub Pawlowski [Thu, 24 May 2018 15:59:34 +0000 (08:59 -0700)]

Add PDU size checks in process_service_search_attr_rsp

Bug: 79884292
Change-Id: Icc02a6188f806f766aa8676804d74995afa08d25
Merged-In: Icc02a6188f806f766aa8676804d74995afa08d25

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 27 Apr 2018 22:17:33 +0000 (22:17 +0000)]

[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd am: 222339b17e am: c8367854c7

Change-Id: I3ce84d852b621ed10425e7437d747f5662fffb46

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 27 Apr 2018 22:17:32 +0000 (22:17 +0000)]

[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd am: 222339b17e

Change-Id: I0d02ebbbae5ad4dc0dedb28a5850070bf60419bd

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 27 Apr 2018 22:17:31 +0000 (22:17 +0000)]

[automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd

Change-Id: I7cce916d3838c1ec8fbdf3be79a8caf71ef00196

commit | commitdiff | tree

akirilov [Fri, 27 Apr 2018 20:08:05 +0000 (13:08 -0700)]

RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)

Bug: 74075873
Test: manual test (poc in bug)
Change-Id: I4f8d2de2fef3f95f99bc2015f1118d6e70d3135b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:03 +0000 (22:47 +0000)]

[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am: 525aee59af am: 6a0ef37a82

Change-Id: I718febf1f78b104c9e122a75dd9e5f94e53637a3

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:01 +0000 (22:47 +0000)]

[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am: 525aee59af

Change-Id: Ib813cfc3cba01369c9ccada373d482544fd60c16

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:00 +0000 (22:47 +0000)]

[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea

Change-Id: I34d8e29615d621cdfadd2f452dd7fd67454929b7

commit | commitdiff | tree

Hansong Zhang [Thu, 26 Apr 2018 22:45:28 +0000 (15:45 -0700)]

DO NOT MERGE Prevent stack overflow in btif_storage

Bug: 73963551
Test: manual
Change-Id: I5f7a583aad150ebf9e3d492181d80ca935c8aa3f

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:57 +0000 (20:09 +0000)]

[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8 am: 13113597ed am: 7d660ff9bf

Change-Id: I6a6369b2bac96ef4926969b5909e85026553aff8

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:56 +0000 (20:09 +0000)]

[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8 am: 13113597ed

Change-Id: Ia7b054ec720067d2b84d8e10f768fa92eb802008

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:54 +0000 (20:09 +0000)]

[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8

Change-Id: Ib7066a2e0075b02ba1d1400b559287e3eef08200

commit | commitdiff | tree

Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]

DO NOT MERGE SMP: Validate remote elliptic curve points

Fixes: 72377774
Test: net_test_stack_smp (where applicable)
Change-Id: Iefcf97364493467075fadefd77d12716f71cd4f6
(cherry picked from commit 9181ec28da94705a763edbe60bd2a87e5f882beb)

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:55 +0000 (20:08 +0000)]

[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525 am: 96e39c15ce

Change-Id: I552dd39875722ac041979c4cce15e378cab32d5a

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:53 +0000 (20:08 +0000)]

[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525

Change-Id: I855b3b72659643947a5d28f01ac37dd6ab920a4f

commit | commitdiff | tree

Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 18:13:11 +0000 (18:13 +0000)]

Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into mnc-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 18:13:11 +0000 (18:13 +0000)]

Merge changes from topic "am-4f00fbdf-3978-4c02-91d3-d55eeb01b9a9-mnc-dev" into mnc-dr1.5-dev

* changes:
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78 am: 8c01980d20 am: 95eed5f744
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78 am: 8c01980d20
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78
  DO NOT MERGE Fix OOB read in process_l2cap_cmd

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 18:13:11 +0000 (18:13 +0000)]

Merge changes from topic "am-4f00fbdf-3978-4c02-91d3-d55eeb01b9a9-mnc-dev" into cw-e-dev

* changes:
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78 am: 8c01980d20
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78
  DO NOT MERGE Fix OOB read in process_l2cap_cmd

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 18:13:11 +0000 (18:13 +0000)]

Merge changes from topic "am-4f00fbdf-3978-4c02-91d3-d55eeb01b9a9-mnc-dev" into mnc-dr-dev

* changes:
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78
DO NOT MERGE Fix OOB read in process_l2cap_cmd

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 12 Apr 2018 23:04:59 +0000 (23:04 +0000)]

[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78 am: 8c01980d20 am: 95eed5f744

Change-Id: Idd62c798d03219b2dbb54e89942b2c89d1091a24

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 12 Apr 2018 23:04:57 +0000 (23:04 +0000)]

[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78 am: 8c01980d20

Change-Id: I4a6bcdd9ed82515e64e6d1b5421dd1bea8570f40

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 12 Apr 2018 23:04:56 +0000 (23:04 +0000)]

[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78

Change-Id: I85ab7eacfae89ad824845707f34b1f15913fbff0

commit | commitdiff | tree

Hansong Zhang [Thu, 12 Apr 2018 23:01:19 +0000 (16:01 -0700)]

DO NOT MERGE Fix OOB read in process_l2cap_cmd

Bug: 74202041
Bug: 74196706
Bug: 74201143
Test: manual
Change-Id: Ic25f7f3777d0375f76cc91e4d129b1636f1c388d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 12 Apr 2018 19:24:57 +0000 (19:24 +0000)]

[automerger] DO NOT MERGE Add bounds check for BNEP_Write am: 5eaf3a642e am: 55e9f35d20 am: 611c4c57f1

Change-Id: Ic76fd58c1524bc09fd0c1c536306fbd2f3b0120a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 12 Apr 2018 19:24:51 +0000 (19:24 +0000)]

[automerger] DO NOT MERGE Add bounds check for BNEP_Write am: 5eaf3a642e am: 55e9f35d20

Change-Id: Ie83d15c1bad2a38c4193771848f96e88c23a11e9

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 12 Apr 2018 19:24:45 +0000 (19:24 +0000)]

[automerger] DO NOT MERGE Add bounds check for BNEP_Write am: 5eaf3a642e

Change-Id: Ib83180b9764bd61ea32525b71446e24018cb3be0

commit | commitdiff | tree

Hansong Zhang [Thu, 12 Apr 2018 19:23:36 +0000 (12:23 -0700)]

DO NOT MERGE Add bounds check for BNEP_Write

Bug: 74947856
Test: manual
Change-Id: I19d9dee53b9cac800c66becef4861e4ad9602bdf

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]

Merge changes from topic "am-c847555c-4096-4a49-be7e-49a3a9c0417a" into mnc-dr1.5-dev

* changes:
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48
  DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]

Merge changes from topic "am-c847555c-4096-4a49-be7e-49a3a9c0417a" into cw-e-dev

* changes:
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48
  DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]

Merge changes from topic "am-c847555c-4096-4a49-be7e-49a3a9c0417a" into mnc-dr-dev

* changes:
[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48
DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 20:13:31 +0000 (20:13 +0000)]

Merge "DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback" into mnc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]

Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into mnc-dr1.5-dev

* changes:
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39
  DO NOT MERGE Handle bad packet length in gatts_process_read_req

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]

Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into cw-e-dev

* changes:
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39
  DO NOT MERGE Handle bad packet length in gatts_process_read_req

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]

Merge changes from topic "mnc-dev-check-pkt-when-processing-gatt-reads2" into mnc-dr-dev

* changes:
[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39
DO NOT MERGE Handle bad packet length in gatts_process_read_req

commit | commitdiff | tree

TreeHugger Robot [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]

Merge "DO NOT MERGE Handle bad packet length in gatts_process_read_req" into mnc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]

Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into mnc-dr1.5-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

commit | commitdiff | tree

TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]

Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into cw-e-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

commit | commitdiff | tree

TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]

Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into mnc-dr-dev

* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

commit | commitdiff | tree

TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]

Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into mnc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 16:22:39 +0000 (16:22 +0000)]

[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e

Change-Id: Ie97dff2f752770f39874af0f824f31a3b820a70d

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 16:22:37 +0000 (16:22 +0000)]

[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b

Change-Id: I349cfe1aad0c6856a5818186774c3e3174307462

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 9 Apr 2018 16:22:35 +0000 (16:22 +0000)]

[automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39

Change-Id: I70949f88b0e060f0923aa0a942a9d785c1802684

commit | commitdiff | tree

Stanley Tng [Thu, 5 Apr 2018 16:54:13 +0000 (09:54 -0700)]

DO NOT MERGE Handle bad packet length in gatts_process_read_req

Added error check and handling code in gatts_process_read_req to
make sure that the packet length is correct.
Please note that there is another earlier CL that is reverted and this
is the updated one.

Bug: 73172115
Test: Run the test program, poc, that was attached in the bug report
Merged-In: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
Change-Id: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
(cherry picked from commit cc9c7330d1c3507d745170ae7b2e0546197b7acb)

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 18:47:11 +0000 (18:47 +0000)]

[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61

Change-Id: Ieccfefa8032ec1a515e8df3d6e618e5d7e470b44

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 18:47:09 +0000 (18:47 +0000)]

[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6

Change-Id: I21d5a838027481e8f55d47fd21a83f837efa2429

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 18:47:08 +0000 (18:47 +0000)]

[automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48

Change-Id: If70f1c69d8d8d8de9fbeae55de123f9dba3b8bf8

commit | commitdiff | tree

Myles Watson [Wed, 21 Mar 2018 23:45:32 +0000 (16:45 -0700)]

DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback

Change I63b857d031c55d3a0754e4101e330843eb422b2a caused a double
free. Move the free call to pan_data_buf_ind_cb().

Free the buffer before every return in pan_data_buf_ind_cb.

Bug: 74950468
Test: manual tethering test with DUT sharing its connection
Change-Id: If4526f3042699581e2cdde79a362eef0f83768eb
Merged-In: If4526f3042699581e2cdde79a362eef0f83768eb
(cherry picked from commit 2e0deb1d135805b37697f0e02a55269c6cc500fe)

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:32 +0000 (16:58 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9

Change-Id: I9d0d9847904b361d457bba6b0f7dba6db9e6e10a

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:30 +0000 (16:58 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874

Change-Id: I4560a77109abd6772f9a7ef7808d073699e23dc5

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:28 +0000 (16:58 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b

Change-Id: I45246189f80aedb86c70064d85006ac8f5ba00ac

commit | commitdiff | tree

Hansong Zhang [Mon, 2 Apr 2018 16:55:58 +0000 (09:55 -0700)]

DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result

Check the number of UUIDs from remote device

Bug: 74016921
Test: manual
Change-Id: I5d3a90bad63af5b22dd155f1d60869b8149d350c

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:23 +0000 (23:57 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb am: f5960e961c

Change-Id: Id9f1cb41fde0ced026415ecf20766edd5df593ca

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:22 +0000 (23:57 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb

Change-Id: Id73dfb4249a191a95a30edf5e43948c6fcafedb6

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:20 +0000 (23:57 +0000)]

[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74

Change-Id: I7c3bc0a75233b759ae029dd7297ea8f77db59723

commit | commitdiff | tree

Hansong Zhang [Fri, 30 Mar 2018 23:55:49 +0000 (16:55 -0700)]

DO NOT MERGE Fix unexpected behavior in smp_sm_event

Bug: 74121126
Test: manual
Change-Id: Ie5dd841d6461ad057c4ab572007f38c5446aba53

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:43 +0000 (00:52 +0000)]

[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: bb3b4ede88 am: 8b50aeebda am: 1bedd9c901

Change-Id: I17e31eed9ba3a869de51e0c472dd2889bc6a951c

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:41 +0000 (00:52 +0000)]

[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: bb3b4ede88 am: 8b50aeebda

Change-Id: Ia1ab5cc9ce36a3087eff3b7caacab41af9979c18

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:40 +0000 (00:52 +0000)]

[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: bb3b4ede88

Change-Id: I338ba0cef8c7b49da0d305a8e2e0217f19acd19c

commit | commitdiff | tree

Hansong Zhang [Fri, 9 Feb 2018 22:21:09 +0000 (14:21 -0800)]

DO NOT MERGE Truncate new line characters when adding string to config

Bug: 70808273
Test: test with a device with newline character in name
Change-Id: Ie7e0b5d93047bc12a9cb84cc15f7f68f38f36441

system/bt

RSS Atom

About OSDN

Find Software

Develop Software

Help