OSDN Git Service
Jakub Pawlowski [Fri, 13 Jul 2018 07:29:45 +0000 (00:29 -0700)]
[automerger skipped] Merge "Don't use Address after it was deleted" into oc-dev am:
28fcaa1b86 -s ours am:
2d028b47a1 -s ours
am:
7abcd322c5 -s ours
Change-Id: Ib40a61baa9c8a5770ea03fc4784beb3c509e5e4b
Jakub Pawlowski [Fri, 13 Jul 2018 07:24:40 +0000 (00:24 -0700)]
[automerger skipped] Merge "Don't use Address after it was deleted" into oc-dev am:
28fcaa1b86 -s ours
am:
2d028b47a1 -s ours
Change-Id: I076b32ad9ed9013923817163a33ac492962efef3
Jakub Pawlowski [Fri, 13 Jul 2018 07:18:38 +0000 (00:18 -0700)]
[automerger skipped] Merge "Don't use Address after it was deleted" into oc-dev
am:
28fcaa1b86 -s ours
Change-Id: I694cbab464170d643cba6f8f6b7ff72e95ca2dd7
Jakub Pawlowski [Fri, 13 Jul 2018 07:06:45 +0000 (00:06 -0700)]
[automerger skipped] Merge "BLE: Don't access freed buffer in log message" into oc-dev am:
7ff736d81e am:
7a5283878f -s ours
am:
095ee1c9ad -s ours
Change-Id: Ib469df8fc27d959054821e63df88811da99ef11c
Jakub Pawlowski [Fri, 13 Jul 2018 07:03:12 +0000 (00:03 -0700)]
[automerger skipped] Merge "BLE: Don't access freed buffer in log message" into oc-dev am:
7ff736d81e
am:
7a5283878f -s ours
Change-Id: I3173dfdb3cf7b441ddb65654734de2750b9b59e2
Jakub Pawlowski [Fri, 13 Jul 2018 06:57:45 +0000 (23:57 -0700)]
Merge "BLE: Don't access freed buffer in log message" into oc-dev
am:
7ff736d81e
Change-Id: I024b9dea0a7a6137410910f35e296b8cbec0a17e
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
Jakub Pawlowski [Fri, 13 Jul 2018 06:12:15 +0000 (23:12 -0700)]
[automerger skipped] [automerger] Add packet length checks in l2cble_process_sig_cmd am:
329b7cfb44 am:
5af2cd5182 am:
24255e38b5 am:
5f29768b74 skipped:
1703d7ed24 am:
62d297d230 -s ours am:
a8fef9b05a -s ours
am:
81f8c5b46a -s ours
Change-Id: I238dc41b152f0c99621398469a368d241205f8f2
Jakub Pawlowski [Fri, 13 Jul 2018 06:08:13 +0000 (23:08 -0700)]
[automerger skipped] [automerger] Add packet length checks in l2cble_process_sig_cmd am:
329b7cfb44 am:
5af2cd5182 am:
24255e38b5 am:
5f29768b74 skipped:
1703d7ed24 am:
62d297d230 -s ours
am:
a8fef9b05a -s ours
Change-Id: I3fbb25fa40fe978b23f8e299ff046cdf87edb05d
Jakub Pawlowski [Fri, 13 Jul 2018 06:04:37 +0000 (23:04 -0700)]
[automerger skipped] [automerger] Add packet length checks in l2cble_process_sig_cmd am:
329b7cfb44 am:
5af2cd5182 am:
24255e38b5 am:
5f29768b74 skipped:
1703d7ed24
am:
62d297d230 -s ours
Change-Id: Ic82c4a595872d8aaf89fcb79d2697529f0d8d522
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
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
Hansong Zhang [Fri, 13 Jul 2018 04:19:44 +0000 (21:19 -0700)]
Merge "HID Host: Check L2CAP packet data length" into oc-dev am:
89cb224e85 am:
12f4de2eef
am:
5691cf9210
Change-Id: I9828be04a35383aba40bf447d379e5c9328047bf
Hansong Zhang [Fri, 13 Jul 2018 04:19:10 +0000 (21:19 -0700)]
Merge "Add bound check for rfc_parse_data" into oc-dev am:
0a5838d047 am:
6e587e5c9b
am:
bf5915d4fe
Change-Id: I571e6531ff65aaf23629c2204c96f9ac3cc4acd1
Hansong Zhang [Fri, 13 Jul 2018 04:18:47 +0000 (21:18 -0700)]
Merge changes from topic "am-
3e56facc-2987-45a7-902e-
643b62b0dad3" into oc-dev am:
c5830db06a am:
953bd8df9b
am:
8d388bffd3
Change-Id: I8dc48fc386c29b5fabdb339a70056cef541d1e5b
Hansong Zhang [Fri, 13 Jul 2018 04:18:17 +0000 (21:18 -0700)]
Merge changes from topic "am-
de483eec-fa20-48e1-8e14-
9d6660359644" into oc-dev am:
91aa6dd927 am:
2291879cbf
am:
26ad0f6493
Change-Id: Ieb6c195e14f1359af1afe88bed0e7f28532fc8c6
Hansong Zhang [Fri, 13 Jul 2018 03:59:39 +0000 (20:59 -0700)]
Merge changes from topic "am-
849ff548-1de9-4e50-a013-
4d02bb85a1d2" into oc-dev am:
15b3c81008 am:
08374e2cc6
am:
88cca4d5e0
Change-Id: I87fe47071e4014c3025310baa137501a190f2ff4
Hansong Zhang [Fri, 13 Jul 2018 03:57:59 +0000 (20:57 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into oc-dev am:
f867aa6b14 am:
539f871a6a
am:
00e4ac12ed -s ours
Change-Id: I647c38554500c476b083ff669d9140390c8185af
Hansong Zhang [Fri, 13 Jul 2018 01:37:36 +0000 (18:37 -0700)]
Merge "HID Host: Check L2CAP packet data length" into oc-dev am:
89cb224e85
am:
12f4de2eef
Change-Id: I8a85b900e7c8317b49cf0197d8bd5b5052380b34
Hansong Zhang [Fri, 13 Jul 2018 01:37:14 +0000 (18:37 -0700)]
Merge "Add bound check for rfc_parse_data" into oc-dev am:
0a5838d047
am:
6e587e5c9b
Change-Id: Ib22851ee7c8e68ec43c14b640c58b286f08f16bd
Hansong Zhang [Fri, 13 Jul 2018 01:36:51 +0000 (18:36 -0700)]
Merge changes from topic "am-
3e56facc-2987-45a7-902e-
643b62b0dad3" into oc-dev am:
c5830db06a
am:
953bd8df9b
Change-Id: I32011dd85bcde1c550058eacd1bb8649a6c2b3c1
Hansong Zhang [Fri, 13 Jul 2018 01:36:17 +0000 (18:36 -0700)]
Merge changes from topic "am-
de483eec-fa20-48e1-8e14-
9d6660359644" into oc-dev am:
91aa6dd927
am:
2291879cbf
Change-Id: Ic36e1cb7841cf5770ef7b524c35b0bb3b7266c40
Hansong Zhang [Fri, 13 Jul 2018 01:35:43 +0000 (18:35 -0700)]
Merge changes from topic "am-
849ff548-1de9-4e50-a013-
4d02bb85a1d2" into oc-dev am:
15b3c81008
am:
08374e2cc6
Change-Id: Ifd0e87e2a6e104f0c7da974662990a73b3b806b5
Hansong Zhang [Fri, 13 Jul 2018 01:35:07 +0000 (18:35 -0700)]
Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into oc-dev am:
f867aa6b14
am:
539f871a6a
Change-Id: Iaccd79bedcb973757fe04daba941074df0ff1bc7
Hansong Zhang [Fri, 13 Jul 2018 00:31:23 +0000 (17:31 -0700)]
Merge "HID Host: Check L2CAP packet data length" into oc-dev
am:
89cb224e85
Change-Id: I7933dec63587b3a9b97db9754216e6de86c01ea6
Hansong Zhang [Fri, 13 Jul 2018 00:29:57 +0000 (17:29 -0700)]
Merge "Add bound check for rfc_parse_data" into oc-dev
am:
0a5838d047
Change-Id: Ie179b9e57a8aa42251cab8ed0dcf5ef91fe1a244
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
Hansong Zhang [Thu, 12 Jul 2018 23:31:02 +0000 (16:31 -0700)]
Merge changes from topic "am-
3e56facc-2987-45a7-902e-
643b62b0dad3" into oc-dev
am:
c5830db06a
Change-Id: I9c42d24c941977bf803df7c1411622c1a921c7fa
Hansong Zhang [Thu, 12 Jul 2018 23:30:22 +0000 (16:30 -0700)]
Merge changes from topic "am-
de483eec-fa20-48e1-8e14-
9d6660359644" into oc-dev
am:
91aa6dd927
Change-Id: I34949e1ee58489ac2c690f023672a749bdcb2698
Hansong Zhang [Thu, 12 Jul 2018 23:29:34 +0000 (16:29 -0700)]
Merge changes from topic "am-
849ff548-1de9-4e50-a013-
4d02bb85a1d2" into oc-dev
am:
15b3c81008
Change-Id: I692f9c4d27a6f3d2594828b96928e3f50bb1d111
Hansong Zhang [Thu, 12 Jul 2018 23:28:48 +0000 (16:28 -0700)]
Merge "DO NOT MERGE Fix OOB read in process_l2cap_cmd" into oc-dev
am:
f867aa6b14
Change-Id: I79868f8b17f4fed7294bc6064f082f8f93b2d272
Nitin Shivpure [Thu, 12 Jul 2018 23:12:39 +0000 (16:12 -0700)]
[automerger skipped] BLE: Don't access freed buffer in log message
am:
f05dc58714 -s ours
Change-Id: I1a9bf5afb246b292bc0b260770a040b8004b2ed2
Jakub Pawlowski [Thu, 12 Jul 2018 22:34:27 +0000 (15:34 -0700)]
Merge "Add packet length checks in l2cble_process_sig_cmd" into oc-dev am:
b20fe49eda am:
18519969e6
am:
a27876d956
Change-Id: I305b7e5d2428d55adc82fdbd34dfc67460b8e3d5
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
Jakub Pawlowski [Thu, 12 Jul 2018 22:20:02 +0000 (22:20 +0000)]
Merge "Fix out of bounds read in l2c_rcv_acl_data" into pi-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 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 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
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
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: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: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 21:10:02 +0000 (21:10 +0000)]
Merge "Fix OOB read in process_l2cap_cmd" into pi-dev
Jakub Pawlowski [Thu, 12 Jul 2018 20:53:46 +0000 (13:53 -0700)]
Merge "Add packet length checks in l2cble_process_sig_cmd" into oc-dev am:
b20fe49eda
am:
18519969e6
Change-Id: I7c5e86edf816862b61974c50f91c184afcab51cc
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
Jakub Pawlowski [Thu, 12 Jul 2018 20:26:03 +0000 (13:26 -0700)]
Merge "Don't use Address after it was deleted" into oc-mr1-dev
am:
e4b316e18c
Change-Id: I0acb68a5b11f5a40e3ba27a504f02561e7be3ede
Jakub Pawlowski [Thu, 12 Jul 2018 20:19:37 +0000 (13:19 -0700)]
Merge "Add packet length checks in l2cble_process_sig_cmd" into oc-dev
am:
b20fe49eda
Change-Id: I4fd9e4c93bc35fb27c2ef880a3429bdb57245368
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
TreeHugger Robot [Thu, 12 Jul 2018 19:51:18 +0000 (19:51 +0000)]
Merge "Don't use Address after it was deleted" into oc-mr1-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
Hansong Zhang [Thu, 12 Jul 2018 17:44:29 +0000 (10:44 -0700)]
Fix OOB read in process_l2cap_cmd
Test: manual
Bug:
79488381
Change-Id: I723866ed40d3647fed99875f659bb95df96a6969
TreeHugger Robot [Thu, 12 Jul 2018 17:37:49 +0000 (17:37 +0000)]
Merge "AVRCP: Reject when CT sends invalid RegisterNotification" into pi-dev
Hansong Zhang [Tue, 10 Jul 2018 19:37:58 +0000 (12:37 -0700)]
AVRCP: Reject when CT sends invalid RegisterNotification
Check whether the RegisterNotification request from CT is valid, and
safely reject invalid request
Bug:
111260441
Test: manually test with RIVA WAND speaker and run net_test_avrcp
Change-Id: Ia2edd94e50fa7cb5b61be54f297adf971060a924
Merged-In: Ia2edd94e50fa7cb5b61be54f297adf971060a924
(cherry picked from commit
db61e462645d2787d5a05f6fa0d0fe9511523c0f)
Jakub Pawlowski [Thu, 12 Jul 2018 09:24:35 +0000 (02:24 -0700)]
[automerger skipped] [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 am:
b762422828 -s ours am:
9600a8ce06 -s ours
am:
72d86860ac -s ours
Change-Id: Ib93613543c84e381605f6689d0f439731650053f
Jakub Pawlowski [Thu, 12 Jul 2018 09:20:56 +0000 (02:20 -0700)]
[automerger skipped] [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 am:
b762422828 -s ours
am:
9600a8ce06 -s ours
Change-Id: I772f355ae6699136699dff7ebcee574ba4affa92
Jakub Pawlowski [Thu, 12 Jul 2018 09:18:02 +0000 (02:18 -0700)]
[automerger skipped] [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
am:
b762422828 -s ours
Change-Id: I39b1ceb8ebb02b5a05d7d7a5d086624b9d7a4d1c
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
Hansong Zhang [Wed, 11 Jul 2018 21:42:35 +0000 (14:42 -0700)]
[automerger skipped] Merge "HFP: Fix out of bound access in phone number processing" into oc-dev am:
6208c7956b -s ours am:
e5e17f0c15 -s ours
am:
d9273e6d60 -s ours
Change-Id: I238cd63a04e1cc4fefbb2a0d2d05fd6acbecf4e3
Hansong Zhang [Wed, 11 Jul 2018 21:28:57 +0000 (14:28 -0700)]
[automerger skipped] Merge "HFP: Fix out of bound access in phone number processing" into oc-dev am:
6208c7956b -s ours
am:
e5e17f0c15 -s ours
Change-Id: I5099a757887f9ce0bae4deef4b907633f959607a
Hansong Zhang [Wed, 11 Jul 2018 21:16:23 +0000 (14:16 -0700)]
[automerger skipped] Merge "HFP: Fix out of bound access in phone number processing" into oc-dev
am:
6208c7956b -s ours
Change-Id: If89074b33649f8956290d26ce9471a36806b9706
Jakub Pawlowski [Wed, 11 Jul 2018 21:14:29 +0000 (14:14 -0700)]
SDP: return error on offset bigger than atribute length am:
0a74ffa44c am:
ff7a2e2592
am:
3705504f14
Change-Id: I24311f5a87dbf5dc8e42516ece159013aa241da8
Jakub Pawlowski [Wed, 11 Jul 2018 21:06:23 +0000 (14:06 -0700)]
SDP: return error on offset bigger than atribute length am:
0a74ffa44c
am:
ff7a2e2592
Change-Id: Id673cf366e28adbd86943caf52d324e23ac95ad8
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 [Wed, 11 Jul 2018 20:56:08 +0000 (13:56 -0700)]
SDP: return error on offset bigger than atribute length
am:
0a74ffa44c
Change-Id: If4811a2a90eec03ab430420ff830aac96abb1590
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
Jack He [Wed, 11 Jul 2018 17:53:49 +0000 (10:53 -0700)]
[automerger skipped] Merge changes from topic "bt-hfp-fix-phone-number-buffer-underflow-nyc-dev" into oc-dev am:
68f3762633 am:
0a352983a9
am:
554ff6982b -s ours
Change-Id: I35939f88eb27e519438bf2e8a6424e2cd051bda1
Jack He [Wed, 11 Jul 2018 17:51:41 +0000 (10:51 -0700)]
Merge changes from topic "bt-hfp-fix-phone-number-buffer-underflow-nyc-dev" into oc-dev am:
68f3762633
am:
0a352983a9
Change-Id: I0ab90774f01847db0fd45c611ed5a78c51282abb
Jack He [Wed, 11 Jul 2018 17:44:52 +0000 (10:44 -0700)]
Merge changes from topic "bt-hfp-fix-phone-number-buffer-underflow-nyc-dev" into oc-dev
am:
68f3762633
Change-Id: I9a3b92eac44c572db7efc30b937f499808098bd6
Hansong Zhang [Wed, 11 Jul 2018 17:42:32 +0000 (10:42 -0700)]
Merge "HIDD: Prevent integer underflow in bta_hd_act" into oc-dev am:
7845f60787 am:
91d327b4af
am:
fc512cb299
Change-Id: I497e0a98cbd008f5e10ed30f2a9712cd1162b469
OSDN Git Service
