OSDN Git Service
Jakub Pawlowski [Fri, 13 Jul 2018 12:42:53 +0000 (12:42 +0000)]
Merge changes from topic "am-
2044de95-4296-4a37-b01a-
af14ae6c2920" into oc-dev
* changes:
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034 am:
81a867b3ec am:
d4b2b3b5d7 skipped:
cf56f96043
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034 am:
81a867b3ec am:
d4b2b3b5d7
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034 am:
81a867b3ec
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b
Fix out of bounds read in l2c_rcv_acl_data
Android Build Merger (Role) [Fri, 13 Jul 2018 10:22:46 +0000 (10:22 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca am:
36f5050f23 am:
e25f074013 am:
88c4c789a8 am:
9bcc43603a am:
ebc968f44e skipped:
eac1fcbb72
Change-Id: I63533f7e0ec803b590fdf8c294248eb356a2ad59
Android Build Merger (Role) [Fri, 13 Jul 2018 10:22:05 +0000 (10:22 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca am:
36f5050f23 am:
e25f074013 am:
88c4c789a8 am:
9bcc43603a am:
ebc968f44e
Change-Id: Ia5da8d8fa0f9e3d0835b7eb6ec5c52182624dc18
Android Build Merger (Role) [Fri, 13 Jul 2018 10:22:03 +0000 (10:22 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca am:
36f5050f23 am:
e25f074013 am:
88c4c789a8 am:
9bcc43603a
Change-Id: Iddc60e5f6966d6a7216839cf6b3fed8ff2e83849
Android Build Merger (Role) [Fri, 13 Jul 2018 10:22:00 +0000 (10:22 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca am:
36f5050f23 am:
e25f074013 am:
88c4c789a8
Change-Id: Iac287ef4964fa4ad8b08bc40c89d8a6b6d5a6ee5
Android Build Merger (Role) [Fri, 13 Jul 2018 10:21:57 +0000 (10:21 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca am:
36f5050f23 am:
e25f074013
Change-Id: Ia0a11c3f24a7b6e6a4f892c568513a3bfad987e4
Android Build Merger (Role) [Fri, 13 Jul 2018 10:21:54 +0000 (10:21 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca am:
36f5050f23
Change-Id: If437e47efd744648d5549e23793894de40281b10
Android Build Merger (Role) [Fri, 13 Jul 2018 10:21:51 +0000 (10:21 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf am:
ba7e4b88ca
Change-Id: I4d7c71a8cec14b94039657bd8de3679a776c473e
Android Build Merger (Role) [Fri, 13 Jul 2018 10:21:48 +0000 (10:21 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d am:
ee283d67bf
Change-Id: I2dcc552158cfc27c73dec217d7f3e2581adf2426
Android Build Merger (Role) [Fri, 13 Jul 2018 10:21:46 +0000 (10:21 +0000)]
[automerger] BLE: Don't access freed buffer in log message am:
6c7c67817d
Change-Id: I9f5c4155c1def43351058c6cbda5f1258e3888d5
Nitin Shivpure [Tue, 6 Feb 2018 12:48:37 +0000 (18:18 +0530)]
BLE: Don't access freed buffer in log message
When GATT fail to write data on L2CAP, buffer is freed by L2CAP.
Accessing the buffer leads to fatal failure while printing the message info.
Test: BLE discover services and BT off test cases
Fixes:
73018520
Change-Id: I661398fd1321f6e68026b3720db4965fd6584d70
Merged-In: I661398fd1321f6e68026b3720db4965fd6584d70
Jakub Pawlowski [Fri, 13 Jul 2018 10:19:15 +0000 (10:19 +0000)]
Merge changes from topic "am-
687d0d76-1eea-4aa7-85c2-
727a2127c13f" into oc-dev
* changes:
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02 am:
5711e0c7d2 am:
f4df487103 am:
1e25b32159
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02 am:
5711e0c7d2 am:
f4df487103
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02 am:
5711e0c7d2
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f
Add packet length checks in l2cble_process_sig_cmd
Jakub Pawlowski [Fri, 13 Jul 2018 10:19:15 +0000 (10:19 +0000)]
Merge changes from topic "am-
687d0d76-1eea-4aa7-85c2-
727a2127c13f" into nyc-mr2-dev
* changes:
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02 am:
5711e0c7d2 am:
f4df487103
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02 am:
5711e0c7d2
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f
Add packet length checks in l2cble_process_sig_cmd
Jakub Pawlowski [Fri, 13 Jul 2018 10:19:15 +0000 (10:19 +0000)]
Merge changes from topic "am-
687d0d76-1eea-4aa7-85c2-
727a2127c13f" into cw-f-dev
* changes:
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02 am:
5711e0c7d2
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f
Add packet length checks in l2cble_process_sig_cmd
Android Build Merger (Role) [Fri, 13 Jul 2018 09:41:08 +0000 (09:41 +0000)]
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034 am:
81a867b3ec am:
d4b2b3b5d7 skipped:
cf56f96043
Change-Id: I2653a755060aeb2276fa7b1b98d775a85b11cca3
Android Build Merger (Role) [Fri, 13 Jul 2018 09:40:39 +0000 (09:40 +0000)]
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034 am:
81a867b3ec am:
d4b2b3b5d7
Change-Id: Id57bca4555cbf458d4b39f4f8ab8d52dcd7188fa
Android Build Merger (Role) [Fri, 13 Jul 2018 09:40:36 +0000 (09:40 +0000)]
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034 am:
81a867b3ec
Change-Id: I80b0aa3927f54a56c87ecad76351a075c5478c7b
Android Build Merger (Role) [Fri, 13 Jul 2018 09:40:33 +0000 (09:40 +0000)]
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b am:
7b75ed3034
Change-Id: I82e38c97577588ebe8738858011ec77ebba0d1ae
Android Build Merger (Role) [Fri, 13 Jul 2018 09:40:31 +0000 (09:40 +0000)]
[automerger] Fix out of bounds read in l2c_rcv_acl_data am:
32b472675b
Change-Id: I7b64ae357697d390972d6c991ab73a4b518bc504
Jakub Pawlowski [Fri, 22 Jun 2018 09:57:19 +0000 (02:57 -0700)]
Fix out of bounds read in l2c_rcv_acl_data
Test: none
Bug:
80432895
Change-Id: I7807d00c02a84c545476e84bc1b71e0718df1f24
Merged-In: I7807d00c02a84c545476e84bc1b71e0718df1f24
Jakub Pawlowski [Fri, 13 Jul 2018 09:24:02 +0000 (09:24 +0000)]
Merge changes from topic "am-
8746f172-81c8-4cc5-8040-
4c8a62f52edd" into oc-dev
* changes:
[automerger] DO NOT MERGE Build fix for cw-f-dev branch am:
4842682057 skipped:
3b7da00cbd
[automerger] DO NOT MERGE Build fix for cw-f-dev branch am:
4842682057
DO NOT MERGE Build fix for cw-f-dev branch
Jakub Pawlowski [Fri, 13 Jul 2018 09:24:02 +0000 (09:24 +0000)]
Merge changes from topic "am-
8746f172-81c8-4cc5-8040-
4c8a62f52edd" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE Build fix for cw-f-dev branch am:
4842682057
DO NOT MERGE Build fix for cw-f-dev branch
Jakub Pawlowski [Fri, 13 Jul 2018 09:24:02 +0000 (09:24 +0000)]
Merge "DO NOT MERGE Build fix for cw-f-dev branch" into cw-f-dev
Android Build Merger (Role) [Fri, 13 Jul 2018 09:17:30 +0000 (09:17 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02 am:
5711e0c7d2 am:
f4df487103 am:
1e25b32159
Change-Id: Ib4b60710673fe2af18f608d1c49276770bb6d58a
Android Build Merger (Role) [Fri, 13 Jul 2018 09:17:28 +0000 (09:17 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02 am:
5711e0c7d2 am:
f4df487103
Change-Id: I3889ad16fb79dc57692ce9edae27db44f6aa8839
Android Build Merger (Role) [Fri, 13 Jul 2018 09:17:25 +0000 (09:17 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02 am:
5711e0c7d2
Change-Id: I529a523e300a88ebc88e37ebeb53a00cd0275872
Android Build Merger (Role) [Fri, 13 Jul 2018 09:17:22 +0000 (09:17 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40 am:
0849546c02
Change-Id: I48680fbb3425ac46b276c15675cef1f0af9cad90
Android Build Merger (Role) [Fri, 13 Jul 2018 09:17:20 +0000 (09:17 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76 am:
12860b6d40
Change-Id: I9f2e6e495a1af2d31fe6b32feff78dc20d88b4d0
Android Build Merger (Role) [Fri, 13 Jul 2018 09:17:18 +0000 (09:17 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06 skipped:
d5ef3c9e76
Change-Id: I88b6879652a667ace51c8e304eeeb0f394493b58
Android Build Merger (Role) [Fri, 13 Jul 2018 09:16:03 +0000 (09:16 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd am:
98366e0b06
Change-Id: Iebe8378ad968c488cbc4b88a986566d40c4bae07
Android Build Merger (Role) [Fri, 13 Jul 2018 09:16:01 +0000 (09:16 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f am:
497f11b0fd
Change-Id: Ia9dfcc76e8a3a464d1d000e59c998d7958119e83
Android Build Merger (Role) [Fri, 13 Jul 2018 09:15:58 +0000 (09:15 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
3a0aab555f
Change-Id: If6a5bdde9eee5540844938956063199c9e640da3
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
Jakub Pawlowski [Fri, 13 Jul 2018 09:02:19 +0000 (09:02 +0000)]
Merge changes from topic "am-
0faa2c83-9779-430a-b81c-
34246f31544a" into oc-dev
* changes:
[automerger] Don't use Address after it was deleted am:
228712652a am:
4530549386 am:
9b5d5d42a9 am:
05d1bec1f5 skipped:
20da1f749e
[automerger] Don't use Address after it was deleted am:
228712652a am:
4530549386 am:
9b5d5d42a9 am:
05d1bec1f5
[automerger] Don't use Address after it was deleted am:
228712652a am:
4530549386 am:
9b5d5d42a9
[automerger] Don't use Address after it was deleted am:
228712652a am:
4530549386
[automerger] Don't use Address after it was deleted am:
228712652a
Don't use Address after it was deleted
Android Build Merger (Role) [Fri, 13 Jul 2018 07:04:53 +0000 (07:04 +0000)]
[automerger] DO NOT MERGE Build fix for cw-f-dev branch am:
4842682057 skipped:
3b7da00cbd
Change-Id: Ieadbff966f81983412fa9fa22a4fa9d7ac83f870
Android Build Merger (Role) [Fri, 13 Jul 2018 07:04:50 +0000 (07:04 +0000)]
[automerger] DO NOT MERGE Build fix for cw-f-dev branch am:
4842682057
Change-Id: I88132fa1372be353122839d83069869e9232afd4
Jakub Pawlowski [Fri, 13 Jul 2018 06:48:11 +0000 (23:48 -0700)]
DO NOT MERGE Build fix for cw-f-dev branch
Change-Id: I04cc8ccd4d53cefa204755bbcd264fd28f5d7591
TreeHugger Robot [Fri, 13 Jul 2018 07:01:05 +0000 (07:01 +0000)]
Merge "Fix out of bounds read in l2c_rcv_acl_data" into oc-dev
Android Build Merger (Role) [Fri, 13 Jul 2018 06:58:49 +0000 (06:58 +0000)]
[automerger] Don't use Address after it was deleted am:
228712652a am:
4530549386 am:
9b5d5d42a9 am:
05d1bec1f5 skipped:
20da1f749e
Change-Id: I30a6041066630d884da6628b9762cfdfedc119b8
Android Build Merger (Role) [Fri, 13 Jul 2018 06:58:21 +0000 (06:58 +0000)]
[automerger] Don't use Address after it was deleted am:
228712652a am:
4530549386 am:
9b5d5d42a9 am:
05d1bec1f5
Change-Id: I9aa11ef1a622f29e976aa2217d4ac91a508065e8
Android Build Merger (Role) [Fri, 13 Jul 2018 06:58:19 +0000 (06:58 +0000)]
[automerger] Don't use Address after it was deleted am:
228712652a am:
4530549386 am:
9b5d5d42a9
Change-Id: Iddf2d0d17974a58e44aa52035a48f336ac4a9f46
Android Build Merger (Role) [Fri, 13 Jul 2018 06:58:15 +0000 (06:58 +0000)]
[automerger] Don't use Address after it was deleted am:
228712652a am:
4530549386
Change-Id: I29002bb4e25f3c026c144f03db577fbdf7ebddf4
Android Build Merger (Role) [Fri, 13 Jul 2018 06:58:12 +0000 (06:58 +0000)]
[automerger] Don't use Address after it was deleted am:
228712652a
Change-Id: Iecd6906bc9eb7ca9376a5094377e25e41bf2dd67
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
TreeHugger Robot [Fri, 13 Jul 2018 06:46:34 +0000 (06:46 +0000)]
Merge "Don't use Address after it was deleted" into oc-dev
Jakub Pawlowski [Fri, 13 Jul 2018 06:44:12 +0000 (06:44 +0000)]
Merge "BLE: Don't access freed buffer in log message" into oc-dev
Nitin Shivpure [Tue, 6 Feb 2018 12:48:37 +0000 (18:18 +0530)]
BLE: Don't access freed buffer in log message
When GATT fail to write data on L2CAP, buffer is freed by L2CAP.
Accessing the buffer leads to fatal failure while printing the message info.
Test: BLE discover services and BT off test cases
Fixes:
73018520
Change-Id: I661398fd1321f6e68026b3720db4965fd6584d70
Merged-In: I661398fd1321f6e68026b3720db4965fd6584d70
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
Android Build Merger (Role) [Fri, 13 Jul 2018 04:47:38 +0000 (04:47 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
329b7cfb44 am:
5af2cd5182 am:
24255e38b5 am:
5f29768b74 skipped:
1703d7ed24
Change-Id: I7de9dac1523542bc7e9568f3167a89afd976bf52
Jakub Pawlowski [Fri, 22 Jun 2018 09:57:19 +0000 (02:57 -0700)]
Fix out of bounds read in l2c_rcv_acl_data
Test: none
Bug:
80432895
Change-Id: I7807d00c02a84c545476e84bc1b71e0718df1f24
Merged-In: I7807d00c02a84c545476e84bc1b71e0718df1f24
Android Build Merger (Role) [Fri, 13 Jul 2018 04:46:42 +0000 (04:46 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
329b7cfb44 am:
5af2cd5182 am:
24255e38b5 am:
5f29768b74
Change-Id: Ie383d28b38e48ab437d52f0f353ca4ac68090905
Android Build Merger (Role) [Fri, 13 Jul 2018 04:46:39 +0000 (04:46 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
329b7cfb44 am:
5af2cd5182 am:
24255e38b5
Change-Id: If5bf9b19b73fc89a7e0e0c5bc979075df15576ca
Android Build Merger (Role) [Fri, 13 Jul 2018 04:46:36 +0000 (04:46 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
329b7cfb44 am:
5af2cd5182
Change-Id: I0878b36f993fd8650c1af39bb3ec86f8ba39721b
Android Build Merger (Role) [Fri, 13 Jul 2018 04:46:33 +0000 (04:46 +0000)]
[automerger] Add packet length checks in l2cble_process_sig_cmd am:
329b7cfb44
Change-Id: I978797eaf4d4b72432b1b5c1cd91c6374ff39f6a
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 23:46:02 +0000 (23:46 +0000)]
Merge "HID Host: Check L2CAP packet data length" into oc-dev
TreeHugger Robot [Thu, 12 Jul 2018 23:44:27 +0000 (23:44 +0000)]
Merge "Add bound check for rfc_parse_data" into oc-dev
TreeHugger Robot [Thu, 12 Jul 2018 22:28:54 +0000 (22:28 +0000)]
Merge changes from topic "am-
3e56facc-2987-45a7-902e-
643b62b0dad3" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a am:
ece21d2579 am:
5866f8bfd8 am:
601d0100e1
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a am:
ece21d2579 am:
5866f8bfd8
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a am:
ece21d2579
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a
DO NOT MERGE HID Host: Check L2CAP packet data length
TreeHugger Robot [Thu, 12 Jul 2018 22:28:54 +0000 (22:28 +0000)]
Merge changes from topic "am-
3e56facc-2987-45a7-902e-
643b62b0dad3" into cw-f-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a am:
ece21d2579 am:
5866f8bfd8
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a am:
ece21d2579
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a
DO NOT MERGE HID Host: Check L2CAP packet data length
TreeHugger Robot [Thu, 12 Jul 2018 22:28:54 +0000 (22:28 +0000)]
Merge changes from topic "am-
3e56facc-2987-45a7-902e-
643b62b0dad3" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a am:
ece21d2579
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a
DO NOT MERGE HID Host: Check L2CAP packet data length
TreeHugger Robot [Thu, 12 Jul 2018 22:28:54 +0000 (22:28 +0000)]
Merge changes from topic "am-
3e56facc-2987-45a7-902e-
643b62b0dad3" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a
DO NOT MERGE HID Host: Check L2CAP packet data length
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:28:54 +0000 (22:28 +0000)]
Merge changes from topic "am-
3e56facc-2987-45a7-902e-
643b62b0dad3" into oc-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a am:
ece21d2579 am:
5866f8bfd8 am:
601d0100e1 skipped:
668d018967
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a am:
ece21d2579 am:
5866f8bfd8 am:
601d0100e1
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a am:
ece21d2579 am:
5866f8bfd8
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a am:
ece21d2579
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
4344cfb76a
DO NOT MERGE HID Host: Check L2CAP packet data length
TreeHugger Robot [Thu, 12 Jul 2018 22:17:26 +0000 (22:17 +0000)]
Merge changes from topic "am-
de483eec-fa20-48e1-8e14-
9d6660359644" into mnc-dr1.5-dev
* changes:
[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 22:17:26 +0000 (22:17 +0000)]
Merge changes from topic "am-
de483eec-fa20-48e1-8e14-
9d6660359644" into cw-e-dev
* changes:
[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 22:17:26 +0000 (22:17 +0000)]
Merge changes from topic "am-
de483eec-fa20-48e1-8e14-
9d6660359644" into mnc-dr-dev
* changes:
[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 22:17:26 +0000 (22:17 +0000)]
Merge "DO NOT MERGE HID Host: Check L2CAP packet data length" into mnc-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-mr2-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349 am:
549ece211e am:
cb4a2ef45a am:
6b3dd6bb73
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349 am:
549ece211e am:
cb4a2ef45a
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349 am:
549ece211e
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349
[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 22:17:26 +0000 (22:17 +0000)]
Merge changes from topic "am-
de483eec-fa20-48e1-8e14-
9d6660359644" into cw-f-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349 am:
549ece211e am:
cb4a2ef45a
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349 am:
549ece211e
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349
[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 22:17:26 +0000 (22:17 +0000)]
Merge changes from topic "am-
de483eec-fa20-48e1-8e14-
9d6660359644" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349 am:
549ece211e
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349
[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 22:17:26 +0000 (22:17 +0000)]
Merge changes from topic "am-
de483eec-fa20-48e1-8e14-
9d6660359644" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349
[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 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 22:17:26 +0000 (22:17 +0000)]
Merge changes from topic "am-
de483eec-fa20-48e1-8e14-
9d6660359644" into oc-dev
* changes:
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349 am:
549ece211e am:
cb4a2ef45a am:
6b3dd6bb73 skipped:
24328f30a2
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349 am:
549ece211e am:
cb4a2ef45a am:
6b3dd6bb73
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349 am:
549ece211e am:
cb4a2ef45a
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349 am:
549ece211e
[automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am:
2da73209f2 am:
7d941ad3a2 am:
56c5b8f060 skipped:
a8668154b7 am:
f2648df349
[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
TreeHugger Robot [Thu, 12 Jul 2018 21:10:42 +0000 (21:10 +0000)]
Merge changes from topic "am-
849ff548-1de9-4e50-a013-
4d02bb85a1d2" into oc-dev
* changes:
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
55afdafb27 am:
09a8721127 am:
9c82c5a589 am:
898cf06169 skipped:
f4cfe48029
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
55afdafb27 am:
09a8721127 am:
9c82c5a589 am:
898cf06169
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
55afdafb27 am:
09a8721127 am:
9c82c5a589
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
55afdafb27 am:
09a8721127
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
55afdafb27
DO NOT MERGE Fix OOB read in process_l2cap_cmd
TreeHugger Robot [Thu, 12 Jul 2018 21:10:21 +0000 (21:10 +0000)]
Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into oc-dev
TreeHugger Robot [Thu, 12 Jul 2018 19:57:41 +0000 (19:57 +0000)]
Merge "Add packet length checks in l2cble_process_sig_cmd" into oc-dev
Android Build Merger (Role) [Thu, 12 Jul 2018 18:01:34 +0000 (18:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
55afdafb27 am:
09a8721127 am:
9c82c5a589 am:
898cf06169 skipped:
f4cfe48029
Change-Id: I98ecf9ab16e9c9c24ff7a1781e36a9fadeb42115
Android Build Merger (Role) [Thu, 12 Jul 2018 18:01:32 +0000 (18:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
55afdafb27 am:
09a8721127 am:
9c82c5a589 am:
898cf06169
Change-Id: I378c40e92e859a4cc56cc9f829548f87ec428229
Android Build Merger (Role) [Thu, 12 Jul 2018 18:01:30 +0000 (18:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
55afdafb27 am:
09a8721127 am:
9c82c5a589
Change-Id: Id65e168ed91b72a4044597dd31f7e2fde17d9d0b
Android Build Merger (Role) [Thu, 12 Jul 2018 18:01:28 +0000 (18:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
55afdafb27 am:
09a8721127
Change-Id: Iafc38d72f8e320249fc81c423b83aa119bcc3a01
Android Build Merger (Role) [Thu, 12 Jul 2018 18:01:25 +0000 (18:01 +0000)]
[automerger] DO NOT MERGE Fix OOB read in process_l2cap_cmd am:
55afdafb27
Change-Id: I285fea77251b0f7734969ba989a0d40d26e95bd3
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
Hansong Zhang [Thu, 12 Jul 2018 17:51:30 +0000 (10:51 -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:42:03 +0000 (07:42 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c am:
612ba99b05 am:
0e36165a54 am:
be55f29975 am:
038f86e4b2 skipped:
529df1e98d
Change-Id: If7e8de188370113ced4bb81c9a31b73eb6669512
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:26 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c am:
612ba99b05 am:
0e36165a54 am:
be55f29975 am:
038f86e4b2
Change-Id: I4d8b0fd5c2b026105e169eb35b3e34de72f5b503
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:24 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c am:
612ba99b05 am:
0e36165a54 am:
be55f29975
Change-Id: Iddf996897230996becbf4f1975fb97b80edbd71a
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:21 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c am:
612ba99b05 am:
0e36165a54
Change-Id: I4aa5b4cd6f852466c6233c9afb51165c06c4616b
Android Build Merger (Role) [Thu, 12 Jul 2018 07:41:18 +0000 (07:41 +0000)]
[automerger] SDP: return error on offset bigger than atribute length am:
3565eaf72d am:
67c78b25ca am:
1c4f9c9624 am:
05ba05199c am:
612ba99b05
Change-Id: Ie004d032313f29c4124c2a114469886429c4cccd
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 21:02:39 +0000 (21:02 +0000)]
Merge "HFP: Fix out of bound access in phone number processing" into oc-dev
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
Hansong Zhang [Wed, 27 Jun 2018 21:26:40 +0000 (14:26 -0700)]
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
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
TreeHugger Robot [Wed, 11 Jul 2018 17:36:21 +0000 (17:36 +0000)]
Merge changes from topic "bt-hfp-fix-phone-number-buffer-underflow-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE HFP: Fix out of bound access in phone number processing am:
82371c1204 am:
fecf347394 am:
2bddcfa923 am:
74de3ffb10 skipped:
2b83b53d14
[automerger] DO NOT MERGE HFP: Fix out of bound access in phone number processing am:
82371c1204 am:
fecf347394 am:
2bddcfa923 am:
74de3ffb10
[automerger] DO NOT MERGE HFP: Fix out of bound access in phone number processing am:
82371c1204 am:
fecf347394 am:
2bddcfa923
[automerger] DO NOT MERGE HFP: Fix out of bound access in phone number processing am:
82371c1204 am:
fecf347394
[automerger] DO NOT MERGE HFP: Fix out of bound access in phone number processing am:
82371c1204
DO NOT MERGE HFP: Fix out of bound access in phone number processing
TreeHugger Robot [Wed, 11 Jul 2018 17:30:33 +0000 (17:30 +0000)]
Merge "HIDD: Prevent integer underflow in bta_hd_act" into oc-dev