OSDN Git Service
Bill Yi [Thu, 29 Nov 2018 02:35:03 +0000 (18:35 -0800)]
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
Change-Id: I2a349df7ad02b6b57044fe77d92b329e1a5afda0
Bill Rassieur [Wed, 10 Oct 2018 17:33:47 +0000 (17:33 +0000)]
Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.
Change-Id: I880c32c18f6af7ece5e3510f72f7a25d9291716c
BUG:
117431430
android-build-team Robot [Mon, 10 Sep 2018 23:21:40 +0000 (23:21 +0000)]
Merge cherrypicks of [
4986743,
4986744,
4987539,
4987168,
4986376,
4986377,
4986378,
4986889,
4986745,
4986746,
4986747,
4986748,
4986749,
4986750,
4986773,
4987169,
4987170,
4987611,
4987631,
4987632,
4987633,
4987634,
4986890,
4987612,
4987651,
4987598,
4987613,
4987614,
4987615,
4987599,
4986379,
4986380,
4987652,
4987653,
4987691,
4986774] into pi-qpr1-release
Change-Id: Ie47fef4ae26050a4b811814aef26157108434cd5
Pavlin Radoslavov [Thu, 6 Sep 2018 01:21:31 +0000 (18:21 -0700)]
Check data length when parsing AVRCP vendor specific command responses
Bug:
111450531
Bug:
111896861
Test: PoC test program
Change-Id: I564bee8f05efabc29383659a75e695b4da76c6aa
(cherry picked from commit
7439ea940354f65a147c4ecfce3bada49c688047)
Pavlin Radoslavov [Thu, 6 Sep 2018 22:41:27 +0000 (15:41 -0700)]
Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp()
Bug:
111450417
Test: PoC test program
Change-Id: Idd619e52dc7a2944d0d08af824505580e299c163
(cherry picked from commit
1c14e10cac53d5a5724dcf34c5679ad8819f9442)
(cherry picked from commit
f779ebe368d245c0d9ac954cf7b2b102e7da56be)
Hansong Zhang [Wed, 5 Sep 2018 23:39:16 +0000 (16:39 -0700)]
HID Device: Fix OOB in register_app
Bug:
113037220
Bug:
113111784
Test: manual
Change-Id: I91bcd5032959458b926c479160c7e391b8de313b
(cherry picked from commit
6aa2d0a5fab28c8829aab4099da0ad450e451c1e)
android-build-team Robot [Thu, 30 Aug 2018 04:24:43 +0000 (04:24 +0000)]
Merge cherrypicks of [
4902694,
4902725,
4902587,
4902588,
4902761,
4902762] into pi-release-2
Change-Id: I8f51b4ae454edb9a785e40aa97bf09b4c308b2b0
Hansong Zhang [Fri, 13 Jul 2018 20:45:46 +0000 (13:45 -0700)]
Fix a wrong check in rfc_parse_data
Bug:
78288018
Bug:
111436796
Test: manual
Change-Id: I16e6026acbaac230fe1453bbac040d1b75bcea2a
(cherry picked from commit
d1ced302cd1066087588c891027b1756be31db46)
Hansong Zhang [Thu, 7 Jun 2018 23:18:52 +0000 (16:18 -0700)]
Add bound check for rfc_parse_data
Bug:
78288018
Test: manual
Change-Id: I44349cd22c141483d01bce0f5a2131b727d0feb0
(cherry picked from commit
6039cb7225733195192b396ad19c528800feb735)
android-build-team Robot [Thu, 23 Aug 2018 03:06:34 +0000 (03:06 +0000)]
Snap for
4972147 from
1ccb7c3489d6775821921ce97bf8b98eb7f7a70c to pi-qpr1-release
Change-Id: Icfd7be2d5dd59b922d98f315ea4bcf5d46a9077c
Ted [Fri, 17 Aug 2018 10:49:37 +0000 (18:49 +0800)]
Fix "Disable Absolute Volume" Bluetooth develop option work
Do not report device support absolute volume while
"Disable Absolute Volume" in developer option is enabled or
the remote device is listed in the interoperability database.
Test: manually adjust volume when Disable Absolute Volume is enabled
Bug:
112193362
Change-Id: Id63a22dba0d8a871035774fc86b66d32e9225b48
Merged-In: Id63a22dba0d8a871035774fc86b66d32e9225b48
android-build-team Robot [Fri, 17 Aug 2018 03:09:19 +0000 (03:09 +0000)]
Snap for
4959688 from
f827e9fc320861552d884a2706c5a93fe33c69e3 to pi-qpr1-release
Change-Id: I0e9322114dbe429b0ba475702cf5f0e590534fe9
android-build-team Robot [Thu, 16 Aug 2018 16:56:40 +0000 (16:56 +0000)]
Merge cherrypicks of [
4793900] into pi-release-2
Change-Id: I5fa73102d69973451a5e21ff5501ad57176718a8
Hansong Zhang [Thu, 16 Aug 2018 16:46:45 +0000 (09:46 -0700)]
Fix build failure in stack/rfcomm/rfc_ts_frames.c
Test: compile
Bug:
112673718
Change-Id: I93cd39f943dd2f0fb65b785c15dc91649c7ee384
(cherry picked from commit
eb3e2528714bd6ea59ad369798f522d75a2e55c7)
android-build-team Robot [Thu, 16 Aug 2018 16:41:08 +0000 (16:41 +0000)]
Merge cherrypicks of [
4793640,
4793602,
4793603,
4793660,
4793604,
4793680,
4793681,
4793581,
4793582,
4793625,
4793626,
4793627,
4793628,
4793700,
4793701,
4793702,
4793703,
4793704,
4793705,
4793661,
4793720,
4793721,
4793722,
4793723,
4793724,
4793725,
4793726,
4793727,
4793728,
4793583,
4793740,
4793760,
4793662,
4793780,
4793729] into pi-release-2
Change-Id: I0cf531aea1ca401fc19225b40e1aecd30773dacd
Cheney Ni [Tue, 7 Aug 2018 13:32:07 +0000 (21:32 +0800)]
Add packet length checks in mca_ccb_hdl_req
Bug:
110791536
Test: manual
Change-Id: Ica5d8037246682fdb190b2747a86ed8d44c2869a
(cherry picked from commit
4de7ccdd914b7a178df9180d15f675b257ea6e02)
Cheney Ni [Wed, 8 Aug 2018 14:20:08 +0000 (22:20 +0800)]
Checks the SMP length to fix OOB read
Bug:
111937065
Test: manual
Change-Id: I330880a6e1671d0117845430db4076dfe1aba688
Merged-In: I330880a6e1671d0117845430db4076dfe1aba688
(cherry picked from commit
fceb753bda651c4135f3f93a510e5fcb4c7542b8)
Ugo Yu [Wed, 8 Aug 2018 08:09:58 +0000 (16:09 +0800)]
Add packet length check in smp_proc_master_id
Bug:
111937027
Test: manual
Change-Id: I1144c9879e84fa79d68ad9d5fece4f58e2a3b075
(cherry picked from commit
c8294662d07a98e9b8b1cab1ab681ec0805ce4e8)
Pavlin Radoslavov [Thu, 9 Aug 2018 20:07:48 +0000 (13:07 -0700)]
Add missing AVRCP message length checks inside avrc_msg_cback
Explicitly check the length of the received message before
accessing the data.
Bug:
111803925
Bug:
79883824
Test: POC scripts
Change-Id: I00b1c6bd6dd7e18ac2c469ef2032c7ff10dcaecb
Merged-In: I00b1c6bd6dd7e18ac2c469ef2032c7ff10dcaecb
(cherry picked from commit
282deb3e27407aaa88b8ddbdbd7bb7d56ddc635f)
(cherry picked from commit
007868d05f4b761842c7345161aeda6fd40dd245)
Chienyuan [Wed, 8 Aug 2018 03:21:28 +0000 (11:21 +0800)]
Check packet length in bta_av_proc_meta_cmd
Bug:
111893951
Test: manual - connect A2DP
Change-Id: Ibbf347863dfd29ea3385312e9dde1082bc90d2f3
(cherry picked from commit
ed51887f921263219bcd2fbf6650ead5ec8d334e)
Hansong Zhang [Mon, 6 Aug 2018 21:40:37 +0000 (14:40 -0700)]
Fix OOB read in avrc_ctrl_pars_vendor_rsp
Bug:
78526423
Test: manual
Change-Id: I0eeacc6a25b12f4b999098375d0d032cfa462a91
(cherry picked from commit
d945ada503ed9c9ea24e092df51faba57f5d589a)
Hansong Zhang [Wed, 8 Aug 2018 18:31:28 +0000 (11:31 -0700)]
Check remaining frame length in rfc_process_mx_message
Bug:
111936792
Bug:
80432928
Test: manual
Change-Id: Ie2c09f3d598fb230ce060c9043f5a88c241cdd79
(cherry picked from commit
0471355c8b035aaa2ce07a33eecad60ad49c5ad0)
Jakub Pawlowski [Mon, 16 Jul 2018 13:40:35 +0000 (06:40 -0700)]
Fix copy length calculation in sdp_copy_raw_data
Test: compilation
Bug:
110216176
Change-Id: Ic4a19c9f0fe8cd592bc6c25dcec7b1da49ff7459
(cherry picked from commit
23aa15743397b345f3d948289fe90efa2a2e2b3e)
android-build-team Robot [Mon, 13 Aug 2018 03:02:37 +0000 (03:02 +0000)]
Snap for
4949382 from
206134dc653cffaed0008da80b53eb860ef96670 to pi-qpr1-release
Change-Id: Iff31803cb311922fb70df7e273dfc0b7d2d67fe2
Ugo Yu [Mon, 13 Aug 2018 02:12:40 +0000 (10:12 +0800)]
Fix wrong UUID mask when doing BLE filter scan
bug:
112350218
Test: manual
Change-Id: I9e4297b936e7a7db164e7ff3bf680c43600c5bda
(cherry picked from commit
04433372392a3c50558cb96f076757472dac2cec)
Cheney Ni [Sat, 11 Aug 2018 00:56:16 +0000 (17:56 -0700)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev am:
816107b1e3 am:
57cde1b147
am:
c019726c62
Change-Id: Ie0d10696cff7d8da694c96af8b224fe4d9061383
Cheney Ni [Sat, 11 Aug 2018 00:55:49 +0000 (17:55 -0700)]
[automerger skipped] Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into oc-dev am:
1718736f85 -s ours am:
3d14101b52 -s ours
am:
02482e1edd -s ours
Change-Id: I69d112ec62826799d275e32cf5499083e84d13fe
Cheney Ni [Sat, 11 Aug 2018 00:27:54 +0000 (17:27 -0700)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev am:
816107b1e3
am:
57cde1b147
Change-Id: I05d1d2af205963afcd1c6bf77c8ca097662e0fc8
Cheney Ni [Sat, 11 Aug 2018 00:27:34 +0000 (17:27 -0700)]
[automerger skipped] Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into oc-dev am:
1718736f85 -s ours
am:
3d14101b52 -s ours
Change-Id: Iceb020184e799318eb665e19544c1c8012f2b9f9
Cheney Ni [Sat, 11 Aug 2018 00:11:43 +0000 (17:11 -0700)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev
am:
816107b1e3
Change-Id: Ic37e076a0e89dc449071b6e715c1ba13034b48e8
Cheney Ni [Sat, 11 Aug 2018 00:11:22 +0000 (17:11 -0700)]
[automerger skipped] Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into oc-dev
am:
1718736f85 -s ours
Change-Id: Id71e8b3945f0d2051c2b642c6ed83c293f5d31fb
TreeHugger Robot [Fri, 10 Aug 2018 23:29:21 +0000 (23:29 +0000)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev
Cheney Ni [Fri, 10 Aug 2018 23:16:31 +0000 (16:16 -0700)]
[automerger skipped] Merge "Checks the SMP length to fix OOB read" into oc-dev am:
a0f6200e5f am:
a2d1977617
am:
4b3d08fa40 -s ours
Change-Id: I28d07e232999bdda412c4263bd23e78aff2c27d5
TreeHugger Robot [Fri, 10 Aug 2018 23:13:53 +0000 (23:13 +0000)]
Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into oc-dev
* changes:
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3 am:
4df8c20808 am:
4bf5cf2228 skipped:
3d75dd009b
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3 am:
4df8c20808 am:
4bf5cf2228
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3 am:
4df8c20808
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3
[automerger] Checks the SMP length to fix OOB read am:
353faee793
Checks the SMP length to fix OOB read
Cheney Ni [Fri, 10 Aug 2018 23:12:26 +0000 (16:12 -0700)]
Merge "Checks the SMP length to fix OOB read" into oc-dev am:
a0f6200e5f
am:
a2d1977617
Change-Id: I04f3e39f4900203999ee16a30540c16698fa1100
Hansong Zhang [Fri, 10 Aug 2018 22:50:24 +0000 (22:50 +0000)]
Merge "Checks the SMP length to fix OOB read" into pi-dev
Cheney Ni [Wed, 8 Aug 2018 14:20:08 +0000 (22:20 +0800)]
Checks the SMP length to fix OOB read
Bug:
111937065
Test: manual
Change-Id: I330880a6e1671d0117845430db4076dfe1aba688
Merged-In: I330880a6e1671d0117845430db4076dfe1aba688
Cheney Ni [Fri, 10 Aug 2018 22:36:13 +0000 (15:36 -0700)]
Merge "Checks the SMP length to fix OOB read" into oc-dev
am:
a0f6200e5f
Change-Id: I878e9a56d3a8f6044fe1922711a50e09861eae08
TreeHugger Robot [Fri, 10 Aug 2018 22:20:14 +0000 (22:20 +0000)]
Merge "Checks the SMP length to fix OOB read" into oc-dev
Ugo Yu [Fri, 10 Aug 2018 22:13:33 +0000 (15:13 -0700)]
Merge "Add packet length check in smp_proc_master_id" into oc-dev am:
7390441c63 am:
039526080b
am:
9d97021204
Change-Id: I44ebb7389fa0c4603991b0e7f6aff8ed114556e9
Pavlin Radoslavov [Fri, 10 Aug 2018 22:13:08 +0000 (15:13 -0700)]
Merge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev am:
a33d897e8a am:
d6f875028c
am:
91f21014e1
Change-Id: If813c8360bc6f7d3e9320f4b700ea1fc41eafb3b
Ugo Yu [Fri, 10 Aug 2018 22:12:41 +0000 (15:12 -0700)]
Merge changes from topic "am-
df95a56f-528f-434c-972e-
bb492348a21a" into oc-dev am:
ab4b63e6ad am:
23d8fb31be
am:
8a49e7f22d
Change-Id: I2e94fdce6511d63f26ad680361b74bdd3a6c5ec0
Ugo Yu [Fri, 10 Aug 2018 22:11:58 +0000 (15:11 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix OOB read before buffer length check" into oc-dev am:
1503110a53 am:
26b6a7cbf4
am:
1b9264d128 -s ours
Change-Id: I7d24941f1309ddc65e60fbc84e6354e414185ba6
Chienyuan [Fri, 10 Aug 2018 22:11:43 +0000 (15:11 -0700)]
Merge "Check packet length in bta_av_proc_meta_cmd" into oc-dev am:
7e52dc116c am:
ccc3cab119
am:
4d0f5bead6
Change-Id: Ifa7a555b5a5cf8b016c7e92a832a55429e435584
Pavlin Radoslavov [Fri, 10 Aug 2018 22:11:18 +0000 (15:11 -0700)]
Merge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into oc-dev am:
3834cbd1e6 am:
abf4e82057
am:
ff19b6e112
Change-Id: I35f75a3cf59ab1bae7921241eb7825305c4ccc6e
Chienyuan [Fri, 10 Aug 2018 22:10:39 +0000 (15:10 -0700)]
Merge changes from topic "am-
c2d9879f-e9d2-44f3-9012-
53037ab580a0" into oc-dev am:
ee9315f84c am:
76ad7b5439
am:
cbfe0fff84
Change-Id: I49d299a85b3e3a00f58dadd3f8af169eab0ca7e4
Ugo Yu [Fri, 10 Aug 2018 22:10:06 +0000 (15:10 -0700)]
Merge changes from topic "am-
a988fd47-73ee-44e9-929f-
5374e8851656" into oc-dev am:
cb0cdcc7ab am:
7e719a45da
am:
52c5bfffba
Change-Id: I5b6d62d23ab555cc25a44ad302da5045247a1662
Ugo Yu [Fri, 10 Aug 2018 21:47:15 +0000 (14:47 -0700)]
Merge "Add packet length check in smp_proc_master_id" into oc-dev am:
7390441c63
am:
039526080b
Change-Id: I42e6c4c2599151607b089452cc2e25d6e5103d47
Pavlin Radoslavov [Fri, 10 Aug 2018 21:46:46 +0000 (14:46 -0700)]
Merge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev am:
a33d897e8a
am:
d6f875028c
Change-Id: Ic28bad0cc518cf908765980c361454c2eeb4fa6d
Ugo Yu [Fri, 10 Aug 2018 21:46:09 +0000 (14:46 -0700)]
Merge "Add packet length check in smp_proc_master_id" into oc-dev
am:
7390441c63
Change-Id: I273c233acac3bca1b37c937f8cf65b004048b451
Pavlin Radoslavov [Fri, 10 Aug 2018 21:45:45 +0000 (14:45 -0700)]
Merge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev
am:
a33d897e8a
Change-Id: If510886dfb48fe6c741ae6766bcb97d8fa3e482e
TreeHugger Robot [Fri, 10 Aug 2018 21:27:38 +0000 (21:27 +0000)]
Merge "Add packet length check in smp_proc_master_id" into oc-dev
Ugo Yu [Fri, 10 Aug 2018 21:15:56 +0000 (14:15 -0700)]
Merge changes from topic "am-
df95a56f-528f-434c-972e-
bb492348a21a" into oc-dev am:
ab4b63e6ad
am:
23d8fb31be
Change-Id: I57612c50ca73f7bb4a1192c66976af3053eb78b7
Ugo Yu [Fri, 10 Aug 2018 21:15:28 +0000 (14:15 -0700)]
Merge "DO NOT MERGE Fix OOB read before buffer length check" into oc-dev am:
1503110a53
am:
26b6a7cbf4
Change-Id: I0b56adc51b64cb6c56d531a4357066c43c87d09d
Chienyuan [Fri, 10 Aug 2018 21:15:07 +0000 (14:15 -0700)]
Merge "Check packet length in bta_av_proc_meta_cmd" into oc-dev am:
7e52dc116c
am:
ccc3cab119
Change-Id: Ied0904860f58347e9cc5cf96ab486c0fce75443d
Pavlin Radoslavov [Fri, 10 Aug 2018 21:14:46 +0000 (14:14 -0700)]
Merge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into oc-dev am:
3834cbd1e6
am:
abf4e82057
Change-Id: I7126caabc99fc2767c63593e938a3510fa6ed187
Chienyuan [Fri, 10 Aug 2018 21:14:13 +0000 (14:14 -0700)]
Merge changes from topic "am-
c2d9879f-e9d2-44f3-9012-
53037ab580a0" into oc-dev am:
ee9315f84c
am:
76ad7b5439
Change-Id: Ia183f05e8f3601b9969f7de86033dbd39b974495
Ugo Yu [Fri, 10 Aug 2018 21:13:35 +0000 (14:13 -0700)]
Merge changes from topic "am-
a988fd47-73ee-44e9-929f-
5374e8851656" into oc-dev am:
cb0cdcc7ab
am:
7e719a45da
Change-Id: Ibfba8a0de4b8eb7ba7905724b742ea1ced2770a5
TreeHugger Robot [Fri, 10 Aug 2018 21:13:03 +0000 (21:13 +0000)]
Merge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev
Ugo Yu [Fri, 10 Aug 2018 21:04:01 +0000 (14:04 -0700)]
Merge changes from topic "am-
df95a56f-528f-434c-972e-
bb492348a21a" into oc-dev
am:
ab4b63e6ad
Change-Id: I510afbc60770cf5d4d272567716d2642154c94ae
Ugo Yu [Fri, 10 Aug 2018 21:03:21 +0000 (14:03 -0700)]
Merge "DO NOT MERGE Fix OOB read before buffer length check" into oc-dev
am:
1503110a53
Change-Id: I06c98bfac27663e6b443c15b0eb02a04f91f48b7
TreeHugger Robot [Fri, 10 Aug 2018 20:55:20 +0000 (20:55 +0000)]
Merge changes from topic "am-
df95a56f-528f-434c-972e-
bb492348a21a" into oc-dev
* changes:
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am:
36bbbbf8db am:
141409e120 am:
b0d91a38af am:
ae3bb5ff30 skipped:
9d3bb2eacf
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am:
36bbbbf8db am:
141409e120 am:
b0d91a38af am:
ae3bb5ff30
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am:
36bbbbf8db am:
141409e120 am:
b0d91a38af
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am:
36bbbbf8db am:
141409e120
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am:
36bbbbf8db
DO NOT MERGE Add packet length check in smp_proc_master_id
TreeHugger Robot [Fri, 10 Aug 2018 20:51:47 +0000 (20:51 +0000)]
Merge "DO NOT MERGE Fix OOB read before buffer length check" into oc-dev
Chienyuan [Fri, 10 Aug 2018 20:49:16 +0000 (13:49 -0700)]
Merge "Check packet length in bta_av_proc_meta_cmd" into oc-dev
am:
7e52dc116c
Change-Id: I95920813d302cc3c363b3339189292efc79d7596
TreeHugger Robot [Fri, 10 Aug 2018 20:38:50 +0000 (20:38 +0000)]
Merge "Check packet length in bta_av_proc_meta_cmd" into oc-dev
Pavlin Radoslavov [Fri, 10 Aug 2018 20:21:59 +0000 (13:21 -0700)]
Merge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into oc-dev
am:
3834cbd1e6
Change-Id: If2a42522be7e34cc5cc5f6ab516c91542ba96b0b
Chienyuan [Fri, 10 Aug 2018 20:21:02 +0000 (13:21 -0700)]
Merge changes from topic "am-
c2d9879f-e9d2-44f3-9012-
53037ab580a0" into oc-dev
am:
ee9315f84c
Change-Id: Idd7c2b6716d1b820bc1a5ccdac29b4c3e5d76ba7
Ugo Yu [Fri, 10 Aug 2018 20:20:20 +0000 (13:20 -0700)]
Merge changes from topic "am-
a988fd47-73ee-44e9-929f-
5374e8851656" into oc-dev
am:
cb0cdcc7ab
Change-Id: If7b0787b082c30363a12a33af0591f83e2017d8e
TreeHugger Robot [Fri, 10 Aug 2018 20:06:42 +0000 (20:06 +0000)]
Merge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE: Add missing AVRCP message length checks inside avrc_msg_cback am:
b78d265f36 am:
750f173103 am:
de283c02ef am:
30c2ddb520 skipped:
2c2b3674f0
[automerger] DO NOT MERGE: Add missing AVRCP message length checks inside avrc_msg_cback am:
b78d265f36 am:
750f173103 am:
de283c02ef am:
30c2ddb520
[automerger] DO NOT MERGE: Add missing AVRCP message length checks inside avrc_msg_cback am:
b78d265f36 am:
750f173103 am:
de283c02ef
[automerger] DO NOT MERGE: Add missing AVRCP message length checks inside avrc_msg_cback am:
b78d265f36 am:
750f173103
[automerger] DO NOT MERGE: Add missing AVRCP message length checks inside avrc_msg_cback am:
b78d265f36
DO NOT MERGE: Add missing AVRCP message length checks inside avrc_msg_cback
TreeHugger Robot [Fri, 10 Aug 2018 19:52:34 +0000 (19:52 +0000)]
Merge changes from topic "am-
c2d9879f-e9d2-44f3-9012-
53037ab580a0" into oc-dev
* changes:
[automerger] DO NOT MERGE Check packet length in bta_av_proc_meta_cmd am:
82815f4498 am:
1bf18942ad am:
ba90170489 am:
24e9e1f47a skipped:
b4b40d8fb3
[automerger] DO NOT MERGE Check packet length in bta_av_proc_meta_cmd am:
82815f4498 am:
1bf18942ad am:
ba90170489 am:
24e9e1f47a
[automerger] DO NOT MERGE Check packet length in bta_av_proc_meta_cmd am:
82815f4498 am:
1bf18942ad am:
ba90170489
[automerger] DO NOT MERGE Check packet length in bta_av_proc_meta_cmd am:
82815f4498 am:
1bf18942ad
[automerger] DO NOT MERGE Check packet length in bta_av_proc_meta_cmd am:
82815f4498
DO NOT MERGE Check packet length in bta_av_proc_meta_cmd
TreeHugger Robot [Fri, 10 Aug 2018 19:43:29 +0000 (19:43 +0000)]
Merge changes from topic "am-
a988fd47-73ee-44e9-929f-
5374e8851656" into oc-dev
* changes:
[automerger] DO NOT MERGE Fix OOB read before buffer length check am:
e64b4a38b0 am:
d952a36975 am:
a999037d02 am:
aa9c254357 skipped:
de319d0416
[automerger] DO NOT MERGE Fix OOB read before buffer length check am:
e64b4a38b0 am:
d952a36975 am:
a999037d02 am:
aa9c254357
[automerger] DO NOT MERGE Fix OOB read before buffer length check am:
e64b4a38b0 am:
d952a36975 am:
a999037d02
[automerger] DO NOT MERGE Fix OOB read before buffer length check am:
e64b4a38b0 am:
d952a36975
[automerger] DO NOT MERGE Fix OOB read before buffer length check am:
e64b4a38b0
DO NOT MERGE Fix OOB read before buffer length check
Android Build Merger (Role) [Fri, 10 Aug 2018 19:18:24 +0000 (19:18 +0000)]
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am:
36bbbbf8db am:
141409e120 am:
b0d91a38af am:
ae3bb5ff30 skipped:
9d3bb2eacf
Change-Id: I1229e8ac6d350832ba6ff099a49f5d27f92636d1
Android Build Merger (Role) [Fri, 10 Aug 2018 19:18:23 +0000 (19:18 +0000)]
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am:
36bbbbf8db am:
141409e120 am:
b0d91a38af am:
ae3bb5ff30
Change-Id: Iefb6c5578e42fa8487e92307cd8f515c88860fd7
Android Build Merger (Role) [Fri, 10 Aug 2018 19:18:21 +0000 (19:18 +0000)]
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am:
36bbbbf8db am:
141409e120 am:
b0d91a38af
Change-Id: I93138feb34fb1128ce81876f0e9dbfee54093cdd
Android Build Merger (Role) [Fri, 10 Aug 2018 19:18:20 +0000 (19:18 +0000)]
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am:
36bbbbf8db am:
141409e120
Change-Id: I8bd45139ee30783cc528062308fdf42d686251f3
Android Build Merger (Role) [Fri, 10 Aug 2018 19:18:18 +0000 (19:18 +0000)]
[automerger] DO NOT MERGE Add packet length check in smp_proc_master_id am:
36bbbbf8db
Change-Id: If6f2f87162f61fd58492dc5bea9485757fe0e695
Ugo Yu [Wed, 8 Aug 2018 08:18:08 +0000 (16:18 +0800)]
DO NOT MERGE Add packet length check in smp_proc_master_id
Bug:
111937027
Test: manual
Change-Id: I2009b6be38f9733931e625379b035e84371fdcaf
Ugo Yu [Wed, 8 Aug 2018 08:09:58 +0000 (16:09 +0800)]
Add packet length check in smp_proc_master_id
Bug:
111937027
Test: manual
Change-Id: I1144c9879e84fa79d68ad9d5fece4f58e2a3b075
Cheney Ni [Wed, 8 Aug 2018 14:40:27 +0000 (22:40 +0800)]
Checks the SMP length to fix OOB read
Bug:
111937065
Test: manual
Change-Id: I330880a6e1671d0117845430db4076dfe1aba688
Merged-In: I330880a6e1671d0117845430db4076dfe1aba688
Android Build Merger (Role) [Fri, 10 Aug 2018 18:00:41 +0000 (18:00 +0000)]
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3 am:
4df8c20808 am:
4bf5cf2228 skipped:
3d75dd009b
Change-Id: I94ee54a9955023586e6b8d8f3a6a35a709bfd1c1
Android Build Merger (Role) [Fri, 10 Aug 2018 17:43:56 +0000 (17:43 +0000)]
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3 am:
4df8c20808 am:
4bf5cf2228
Change-Id: Ifaae2e4562c49bb94e6619384bb6298693d4c61a
Android Build Merger (Role) [Fri, 10 Aug 2018 17:43:55 +0000 (17:43 +0000)]
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3 am:
4df8c20808
Change-Id: I021f0cf3d6d7da12f09b7fcd61720a112d789dba
Android Build Merger (Role) [Fri, 10 Aug 2018 17:43:53 +0000 (17:43 +0000)]
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3
Change-Id: Ib0dd794d01ce85e30c1665b45733befa4af59dda
Android Build Merger (Role) [Fri, 10 Aug 2018 17:43:52 +0000 (17:43 +0000)]
[automerger] Checks the SMP length to fix OOB read am:
353faee793
Change-Id: I897f7f6dec710a102f8fcf0b307be6973eedf994
Cheney Ni [Wed, 8 Aug 2018 14:40:27 +0000 (22:40 +0800)]
Checks the SMP length to fix OOB read
Bug:
111937065
Test: manual
Change-Id: I330880a6e1671d0117845430db4076dfe1aba688
Merged-In: I330880a6e1671d0117845430db4076dfe1aba688
Jakub Pawlowski [Fri, 10 Aug 2018 09:05:28 +0000 (02:05 -0700)]
[automerger skipped] [automerger] Fix copy length calculation in sdp_copy_raw_data am:
1a0571a4ac am:
fc08bac226 am:
78014df470 am:
427c2c7783 skipped:
ea23ff5608 am:
682936d05d -s ours am:
6354a16d8e -s ours
am:
7051739728 -s ours
Change-Id: I9f1d009af5c3cbc397c3b9f49261bd67ae4607a7
Jakub Pawlowski [Fri, 10 Aug 2018 08:58:24 +0000 (01:58 -0700)]
[automerger skipped] [automerger] Fix copy length calculation in sdp_copy_raw_data am:
1a0571a4ac am:
fc08bac226 am:
78014df470 am:
427c2c7783 skipped:
ea23ff5608 am:
682936d05d -s ours
am:
6354a16d8e -s ours
Change-Id: I59fb0d9115ae761af37f0b4749288a224e08b71c
Jakub Pawlowski [Fri, 10 Aug 2018 08:53:18 +0000 (01:53 -0700)]
[automerger skipped] [automerger] Fix copy length calculation in sdp_copy_raw_data am:
1a0571a4ac am:
fc08bac226 am:
78014df470 am:
427c2c7783 skipped:
ea23ff5608
am:
682936d05d -s ours
Change-Id: I03b13f5f9d93f1c2ad07cfc6338b8a65917078f9
Android Build Merger (Role) [Fri, 10 Aug 2018 07:04:56 +0000 (07:04 +0000)]
[automerger] Fix copy length calculation in sdp_copy_raw_data am:
1a0571a4ac am:
fc08bac226 am:
78014df470 am:
427c2c7783 skipped:
ea23ff5608
Change-Id: I5ee4cb73177c56e7adfe4a96a22f7d1a49248f19
Android Build Merger (Role) [Fri, 10 Aug 2018 07:04:30 +0000 (07:04 +0000)]
[automerger] Fix copy length calculation in sdp_copy_raw_data am:
1a0571a4ac am:
fc08bac226 am:
78014df470 am:
427c2c7783
Change-Id: I37cb9240f3e471768d454e41a37143f16bd4f4e7
Android Build Merger (Role) [Fri, 10 Aug 2018 07:04:27 +0000 (07:04 +0000)]
[automerger] Fix copy length calculation in sdp_copy_raw_data am:
1a0571a4ac am:
fc08bac226 am:
78014df470
Change-Id: I3b15e7664fac9d395b07a13365af57379ef6bfac
Android Build Merger (Role) [Fri, 10 Aug 2018 07:04:24 +0000 (07:04 +0000)]
[automerger] Fix copy length calculation in sdp_copy_raw_data am:
1a0571a4ac am:
fc08bac226
Change-Id: I6eb912e2613ec8549f9a8a579d7440ed876fd0e7
Android Build Merger (Role) [Fri, 10 Aug 2018 07:04:22 +0000 (07:04 +0000)]
[automerger] Fix copy length calculation in sdp_copy_raw_data am:
1a0571a4ac
Change-Id: I8334874f9f3037833a60c0b84c9fea593b7daffa
Jakub Pawlowski [Mon, 16 Jul 2018 13:40:35 +0000 (06:40 -0700)]
Fix copy length calculation in sdp_copy_raw_data
Test: compilation
Bug:
110216176
Change-Id: Ic4a19c9f0fe8cd592bc6c25dcec7b1da49ff7459
Merged-In: Ic4a19c9f0fe8cd592bc6c25dcec7b1da49ff7459
android-build-team Robot [Fri, 10 Aug 2018 03:01:37 +0000 (03:01 +0000)]
Snap for
4945494 from
55cbfc0145103ea34fd90c98f408c678e4b068e6 to pi-qpr1-release
Change-Id: I4696e8ccbfbd4a64b65f4563e0e56fcc5e5a1c75
Hansong Zhang [Fri, 10 Aug 2018 02:10:02 +0000 (19:10 -0700)]
Merge "Fix OOB read in avrc_ctrl_pars_vendor_rsp" into oc-dev am:
014a36a1f7 am:
ce16531dbc
am:
39caefd0d4
Change-Id: Ifc68c195e1ffe987e46a5340abfa09212ee73504
Hansong Zhang [Fri, 10 Aug 2018 02:04:58 +0000 (19:04 -0700)]
Merge "Fix OOB read in avrc_ctrl_pars_vendor_rsp" into oc-dev am:
014a36a1f7
am:
ce16531dbc
Change-Id: Id3669fa2cb1a4c45f5f0f92903b857d0fa2b7ba9
Hansong Zhang [Fri, 10 Aug 2018 01:59:05 +0000 (18:59 -0700)]
Merge "Fix OOB read in avrc_ctrl_pars_vendor_rsp" into oc-dev
am:
014a36a1f7
Change-Id: I073b4b96930ecd4150f6515fe64485a1dce1370d
TreeHugger Robot [Fri, 10 Aug 2018 01:46:44 +0000 (01:46 +0000)]
Merge "Fix OOB read in avrc_ctrl_pars_vendor_rsp" into oc-dev
Hansong Zhang [Fri, 10 Aug 2018 00:59:10 +0000 (17:59 -0700)]
Merge changes from topic "am-
49bd153a-ceb2-41b6-8588-
4e6a6475d94a" into oc-dev am:
b01b82b03a am:
23996390b5
am:
66403af3c6
Change-Id: Id362dab356a51c43b095d8cbfee8a05016033597
OSDN Git Service
