OSDN Git Service
Jakub Pawlowski [Wed, 11 Jul 2018 09:57:07 +0000 (02:57 -0700)]
Don't use Address after it was deleted
Bug:
110216173
Change-Id: Id3364cf53153eafed478546d7347ed1673217e91
Merged-In: Id3364cf53153eafed478546d7347ed1673217e91
Jakub Pawlowski [Fri, 22 Jun 2018 05:56:11 +0000 (22:56 -0700)]
Add packet length checks in l2cble_process_sig_cmd
Bug:
80261585
Test: compilation
Change-Id: Icf55747dc948bcce140a12658237554938e2d717
Merged-In: Icf55747dc948bcce140a12658237554938e2d717
TreeHugger Robot [Thu, 12 Jul 2018 22:28:54 +0000 (22:28 +0000)]
Merge "DO NOT MERGE HID Host: Check L2CAP packet data length" into nyc-dev
TreeHugger Robot [Thu, 12 Jul 2018 22:17:26 +0000 (22:17 +0000)]
Merge changes from topic "am-
de483eec-fa20-48e1-8e14-
9d6660359644" into nyc-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2
DO NOT MERGE HID Host: Check L2CAP packet data length
TreeHugger Robot [Thu, 12 Jul 2018 21:10:42 +0000 (21:10 +0000)]
Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into nyc-dev
Hansong Zhang [Thu, 12 Jul 2018 18:00:53 +0000 (11:00 -0700)]
DO NOT MERGE Fix OOB read in process_l2cap_cmd
Test: manual
Bug:
79488381
Change-Id: I723866ed40d3647fed99875f659bb95df96a6969
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:15 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c
Change-Id: I95b70f63b81df6f58b516b83853fc0bbef7eccc8
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:12 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624
Change-Id: Idb5ac3b18ec180a90eca120754d601c1ba68edbf
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:10 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca
Change-Id: I3e68fbd29ce151c4829fe6077d76bc3822915c8f
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:07 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d
Change-Id: Ic7b10e46c591edff7f86c06dee6beb8ca8798121
Jakub Pawlowski [Fri, 22 Jun 2018 11:46:39 +0000 (04:46 -0700)]
SDP: return error on offset bigger than atribute length
Test: none
Bug:
79217770
Change-Id: I8b594882dd07644b1a747c53d6166db466b7e998
Merged-In: I8b594882dd07644b1a747c53d6166db466b7e998
TreeHugger Robot [Wed, 11 Jul 2018 17:36:21 +0000 (17:36 +0000)]
Merge "DO NOT MERGE HFP: Fix out of bound access in phone number processing" into nyc-dev
Jack He [Wed, 27 Jun 2018 00:53:24 +0000 (17:53 -0700)]
DO NOT MERGE HFP: Fix out of bound access in phone number processing
* Write at most sizeof(dialnum) chars into dialnum array in ClccResponse
method
* Write at most sizeof(ag_res.str) - 5 chars into ag_res.str array in
PhoneStateChange method
Bug:
79431031
Bug:
79266386
Test: make call with super long phone numbers
Change-Id: I98e7687ac4055800aa46626c6b1c866e52e474df
Merged-In: I98e7687ac4055800aa46626c6b1c866e52e474df
Hansong Zhang [Thu, 7 Jun 2018 21:18:22 +0000 (14:18 -0700)]
DO NOT MERGE HID Host: Check L2CAP packet data length
Bug:
80493272
Test: manual
Change-Id: I8b1acd11616684729752195fabb4fa34c46a508d
Android Build Merger (Role) [Thu, 7 Jun 2018 21:27:51 +0000 (21:27 +0000)]
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7
Change-Id: Ib12a006ee1c5d3ed781e674e2091b7bf8c30036b
Android Build Merger (Role) [Thu, 7 Jun 2018 21:27:49 +0000 (21:27 +0000)]
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060
Change-Id: I999dbbc621168887e993159271c59aa526af4d8e
Android Build Merger (Role) [Thu, 7 Jun 2018 21:27:47 +0000 (21:27 +0000)]
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2
Change-Id: I98eea999519f71f72df32c82a42ebcaae9aeb95f
Android Build Merger (Role) [Thu, 7 Jun 2018 21:27:45 +0000 (21:27 +0000)]
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2
Change-Id: I4356335c6ee6b0e3717e22d94ff9e8bb0574e663
Hansong Zhang [Thu, 7 Jun 2018 21:02:30 +0000 (14:02 -0700)]
DO NOT MERGE HID Host: Check L2CAP packet data length
Bug:
80493272
Test: manual
Change-Id: I8b1acd11616684729752195fabb4fa34c46a508d
TreeHugger Robot [Thu, 7 Jun 2018 01:53:54 +0000 (01:53 +0000)]
Merge "DO NOT MERGE: Don't reuse buffer when building response" into nyc-dev
Ajay Panicker [Wed, 6 Jun 2018 21:58:54 +0000 (14:58 -0700)]
DO NOT MERGE: Don't reuse buffer when building response
Bug:
79541338
Test: Compile and connect to remote headset
Change-Id: I5e059615db589e165630f39d631a922006c2d70f
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:23 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d
Change-Id: I5d7ceaba658d90e8a8931b50a6c8774f2c690b5d
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:21 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d
Change-Id: I9d251934afe063299b4b7f36ea63c214b5188577
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:20 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351
Change-Id: I7b8076d21aeeb80c469764d0643ee54e9de049ff
Android Build Merger (Role) [Thu, 7 Jun 2018 00:43:18 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8
Change-Id: I73fc976256c6af11d7431778b3c962a2816f5f5f
Ajay Panicker [Wed, 6 Jun 2018 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE: Don't reuse buffer when building response
Bug:
79541338
Test: Compile and connect to remote headset
Change-Id: I2c00660bb551bbac58df88d2df07c98a30871e58
Android Build Merger (Role) [Tue, 5 Jun 2018 03:48:20 +0000 (03:48 +0000)]
[automerger] Add checks whether the AVDTP element data length is valid am:
e192c988cb am:
6b2f63f880 am:
ac8793939a am:
862eb4827b
Change-Id: I336035e480bcd33d67b90543a9f81fe919dc649a
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
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
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
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
Jack He [Tue, 5 Jun 2018 00:40:42 +0000 (17:40 -0700)]
DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf
Bug:
79164722
Bug:
78286118
Test: make
Change-Id: I04fc994d9bca80aa4711118d3c5be02f2b809a48
Android Build Merger (Role) [Mon, 4 Jun 2018 23:10:07 +0000 (23:10 +0000)]
[automerger] BNEP: Fix OOB access in bnep_data_ind am:
0bd01271c4 am:
8f9b349c23 am:
81dcda9a5a am:
eee28a5a06
Change-Id: I5018c4115f5502d5f88c955f77221339663eca91
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
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
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
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)
Android Build Merger (Role) [Fri, 1 Jun 2018 19:11:22 +0000 (19:11 +0000)]
[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am:
0a8453ba41 am:
f60bc5a9a8 am:
9619144b16 am:
b37a3d0a19
Change-Id: I95a38db1c94e545a10f894f56319cb9b38c465fa
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
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
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
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
Android Build Merger (Role) [Thu, 31 May 2018 22:59:12 +0000 (22:59 +0000)]
[automerger] Decrease length after reading from array in process_service_attr_req am:
76e962892e am:
7c0954970d am:
a2c06775c0 am:
c1b04d4179
Change-Id: I3aa367983196c35c902d46e96b82378acd1b2e2b
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
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
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
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
Atanas Kirilov [Thu, 31 May 2018 22:04:38 +0000 (22:04 +0000)]
Merge "RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)" into nyc-dev
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)
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)
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)
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
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)
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
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
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
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
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
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
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
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
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
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
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
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
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)
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)
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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: I18e652f7e10ba42db6f2553083d2a2eec10e2998
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
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
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
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
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
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
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
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
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
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
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