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

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

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 18:47:12 +0000 (18:47 +0000)]

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

Change-Id: Ieb162bb1cd63758ac343389e381923c488bce206

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:33 +0000 (16:58 +0000)]

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

Change-Id: I30ae8f458e18a4b4fb2c8457dca65ce68307cf46

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

Hansong Zhang [Mon, 2 Apr 2018 16:29:49 +0000 (09:29 -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: I7e1fd420c96bdb4d8b1bb129eb85045f9e3da443

commit | commitdiff | tree

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

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

Change-Id: I608a9e64ae1882c318a8bc8f2710990679b496a0

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

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

Ajay Panicker [Fri, 2 Feb 2018 09:11:37 +0000 (01:11 -0800)]

DO NOT MERGE: AVRCP: Check number of text attribute values in response

Test: Build
Bug: 71603410
Change-Id: I6f822b0bc7fc2fb042a70b64cff61583a86b36e2

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Feb 2018 19:03:46 +0000 (19:03 +0000)]

Merge "DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 12 Feb 2018 19:03:09 +0000 (19:03 +0000)]

Merge "DO NOT MERGE: AVRCP: Check number of text attributes in response" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Sat, 10 Feb 2018 19:17:51 +0000 (19:17 +0000)]

Merge "DO NOT MERGE Truncate new line characters when adding string to config" into nyc-dev

commit | commitdiff | tree

Hansong Zhang [Fri, 9 Feb 2018 23:23:07 +0000 (15:23 -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

commit | commitdiff | tree

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

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

Change-Id: Ia5e49a4cb49329fd3a2e5b687d9e5372f88b35df

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

commit | commitdiff | tree

Ajay Panicker [Fri, 2 Feb 2018 08:56:43 +0000 (00:56 -0800)]

DO NOT MERGE: AVRCP: Check number of text attributes in response

Test: Build
Bug: 71603315
Change-Id: Ieda5e410057062533ae09bd977bfe7f758a55140

commit | commitdiff | tree

Ajay Panicker [Fri, 2 Feb 2018 09:26:34 +0000 (01:26 -0800)]

DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to

Test: Build
Bug: 71603553
Change-Id: I978270605cfaa3b833d6c19f1b1d2cd5a82ac079

commit | commitdiff | tree

TreeHugger Robot [Wed, 7 Feb 2018 21:28:42 +0000 (21:28 +0000)]

Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:16 +0000 (20:09 +0000)]

[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf2f4 am: 5c6b00689a am: 8b680c2ac4 skipped: d2a6ebc407

Change-Id: Iae89be86bc20908521d2c99a099f8728c4e9f820

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:15 +0000 (20:09 +0000)]

[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf2f4 am: 5c6b00689a am: 8b680c2ac4

Change-Id: Iaec135fc10b631d0ba46467ba71692f8a60e477c

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:13 +0000 (20:09 +0000)]

[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf2f4 am: 5c6b00689a

Change-Id: Idde655e8a3377560317189bbc49620670c5923c8

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 20:09:12 +0000 (20:09 +0000)]

[automerger] DO NOT MERGE: SDP: Check p_req_end before reading from p_req am: c5ceedf2f4

Change-Id: I2462f1128b027a515b616beb005c879e6d372f27

commit | commitdiff | tree

Myles Watson [Fri, 12 Jan 2018 01:43:40 +0000 (17:43 -0800)]

DO NOT MERGE: SDP: Check p_req_end before reading from p_req

Bug: 69384124
Test: Connect a headset
Change-Id: Ia30c58ed39977552e5ddc21cc3c1b54c6b1d8abe

commit | commitdiff | tree

Myles Watson [Fri, 12 Jan 2018 01:43:40 +0000 (17:43 -0800)]

DO NOT MERGE: SDP: Check p_req_end before reading from p_req

Bug: 69384124
Test: Connect a headset
Change-Id: Ia30c58ed39977552e5ddc21cc3c1b54c6b1d8abe

commit | commitdiff | tree

Myles Watson [Tue, 16 Jan 2018 18:08:23 +0000 (18:08 +0000)]

Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am: f3c40264c4 am: 1f573b136d am: 1c4f74e02c
am: 0f9c39d5cd

Change-Id: I56a016ee9e1459472e97a341b8cbc9b8253b230b

commit | commitdiff | tree

Myles Watson [Tue, 16 Jan 2018 18:03:20 +0000 (18:03 +0000)]

Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am: f3c40264c4 am: 1f573b136d
am: 1c4f74e02c

Change-Id: I160dce825ef9490fea2c9614472d4bb2477cfb40

commit | commitdiff | tree

Myles Watson [Tue, 16 Jan 2018 17:58:18 +0000 (17:58 +0000)]

Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev am: f3c40264c4
am: 1f573b136d

Change-Id: I2d2d968c09bc690ec03ee54a1a4060ef2ba71eac

commit | commitdiff | tree

Myles Watson [Tue, 16 Jan 2018 17:53:49 +0000 (17:53 +0000)]

Merge "SDP: Pass the bounds to process_service_*_rsp" into mnc-dev
am: f3c40264c4

Change-Id: I22c76d476befb51d5e8b8c1d5557e711d8949507

system/bt

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.