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

OSDN Git Service

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

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

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 nyc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: 6cf3df79fd am: 222339b17e am: c8367854c7 skipped: 64cd03aa4a
  [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

TreeHugger Robot [Thu, 31 May 2018 21:18:04 +0000 (21:18 +0000)]

Merge "DO NOT MERGE: SDP: Recalculate param_len after max_list_len" into nyc-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 nyc-dev

* changes:
  [automerger] DO NOT MERGE: SDP: Recalculate param_len after max_list_len am: 89f6f14938 am: 1ded57e67f am: f078bbf975 skipped: 4051c98111
  [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 17:41:46 +0000 (17:41 +0000)]

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

commit | commitdiff | tree

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

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

Change-Id: Icd6b0ce2d5992e0ddc60146639c69cb092dc6bdf

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

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

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) [Wed, 30 May 2018 00:36:38 +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 skipped: d61c73ca13

Change-Id: I910d07217dfc15485d8a684d4cd9b6d95476c3bc

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:16 +0000 (07:29 +0000)]

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

Change-Id: I5a24b2d428c69771380e3d6484f9770a3c8cf33e

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:25 +0000 (02:50 +0000)]

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

Change-Id: I274a46dd9edf3810f47daf791e1dc69c6ba0504b

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

Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]

Merge "DO NOT MERGE: Check number of attributes before writing to a buffer" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 11 May 2018 22:24:01 +0000 (22:24 +0000)]

Merge "DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into nyc-dev

commit | commitdiff | tree

Ajay Panicker [Fri, 11 May 2018 18:47:31 +0000 (11:47 -0700)]

DO NOT MERGE: Check number of attributes before writing to a buffer

Bug: 73824150
Test: Compile
Change-Id: Ie38ba177d6599afe28b5c6684bd951a75fa8a805

commit | commitdiff | tree

Hansong Zhang [Fri, 11 May 2018 18:40:44 +0000 (11:40 -0700)]

DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE

Test: manual
Bug: 73782082
Change-Id: I4e384a2f8c0d8c4af03bd5865b2e907321419c86

commit | commitdiff | tree

android-build-team Robot [Thu, 3 May 2018 23:15:36 +0000 (23:15 +0000)]

Merge "DO NOT MERGE Prevent stack overflow in btif_storage" into nyc-dev

commit | commitdiff | tree

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

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

Change-Id: I1d63417a1c45d189fd2f3ccb331489f38b280c20

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

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) [Thu, 26 Apr 2018 22:47:05 +0000 (22:47 +0000)]

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

Change-Id: Id44112648ab9ba78c64631ae2613e154a42f15a6

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:58 +0000 (20:09 +0000)]

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

Change-Id: I09c7fbeb8ca3814d2c91aac744ca5c91fa8e34c4

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:56 +0000 (20:08 +0000)]

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

Change-Id: I3d83c500f4504773a3d9160d984ef91aeaa63d36

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

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

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

TreeHugger Robot [Fri, 13 Apr 2018 20:29:14 +0000 (20:29 +0000)]

Merge "DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into nyc-dev

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

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 nyc-dev

* changes:
  [automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am: 8c2b087c78 am: 8c01980d20 am: 95eed5f744 skipped: 85d60d236f
  [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:04 +0000 (18:13 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 13 Apr 2018 17:14:22 +0000 (17:14 +0000)]

Merge changes from topic "am-95b770cf-713e-4c26-a12d-ca284eb0fbd7" into nyc-dev

* changes:
  [automerger] DO NOT MERGE Add bounds check for BNEP_Write am: 5eaf3a642e am: 55e9f35d20 am: 611c4c57f1 skipped: 9197ada442
  [automerger] DO NOT MERGE Add bounds check for BNEP_Write am: 5eaf3a642e am: 55e9f35d20 am: 611c4c57f1
  [automerger] DO NOT MERGE Add bounds check for BNEP_Write am: 5eaf3a642e am: 55e9f35d20
  [automerger] DO NOT MERGE Add bounds check for BNEP_Write am: 5eaf3a642e
  DO NOT MERGE Add bounds check for BNEP_Write

commit | commitdiff | tree

Ajay Panicker [Thu, 12 Apr 2018 23:50:06 +0000 (16:50 -0700)]

DO NOT MERGE: Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ

Bug: 74121659
Test: Compiles
Change-Id: Ib29dd50cee9decda2d73bb79b84215ea4c6ead75

commit | commitdiff | tree

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

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

Change-Id: Ifdee9a139c36cf21c62c0332aa6fea731a8da526

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

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

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

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

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

Change-Id: I8e2c1ec223c8a8657607ffaf7303c4e8fbd624d8

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 nyc-dev

* changes:
  [automerger] DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback am: 8f34bd0e48 am: cd6b4f2aa6 am: 67ca6c7f61 skipped: 97ddd22ee8
  [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 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 20:04:54 +0000 (20:04 +0000)]

Merge "DO NOT MERGE: PAN: Always allocate in bta_pan_data_buf_ind_cback" into nyc-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 [Wed, 11 Apr 2018 15:22:23 +0000 (15:22 +0000)]

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

* changes:
  [automerger] DO NOT MERGE Handle bad packet length in gatts_process_read_req am: dc67046a39 am: 3e4b66815b am: 92c087346e skipped: 4d0c684647
  [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:19:58 +0000 (15:19 +0000)]

Merge "DO NOT MERGE Handle bad packet length in gatts_process_read_req" into nyc-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

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

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

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: 4e583ae97b am: e986af6874 am: a37f3e68b9 skipped: 11fe847f5b
  [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:27 +0000 (20:41 +0000)]

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

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, 9 Apr 2018 16:22:40 +0000 (16:22 +0000)]

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

Change-Id: I382274e4bad3579bbb1030640b38469d0901cdf4

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

TreeHugger Robot [Fri, 6 Apr 2018 22:41:24 +0000 (22:41 +0000)]

Merge "DO NOT MERGE Drop LE CoC fragments when frame size is too big" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Fri, 6 Apr 2018 22:30:25 +0000 (22:30 +0000)]

Merge "DO NOT MERGE Fix unexpected behavior in smp_sm_event" into nyc-dev

commit | commitdiff | tree

Stanley Tng [Wed, 4 Apr 2018 23:38:22 +0000 (16:38 -0700)]

DO NOT MERGE Drop LE CoC fragments when frame size is too big

Drop the LE CoC data fragments when the received fragment size is too
big.

Test: Runs LE CoC SL4A test, BleCocTest.
Bug: 75298652
Merged-In: I529944341e9e67a39e7ec7e740d5ada3db8cc23a
Change-Id: I529944341e9e67a39e7ec7e740d5ada3db8cc23a

system/bt

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.