OSDN Git Service
Pavlin Radoslavov [Fri, 7 Sep 2018 16:33:50 +0000 (09:33 -0700)]
Merge changes from topic "bt-security-avrc_ctrl_pars_vendor_rsp-length-check-nyc-dev" into oc-dev am:
5e20d5088c am:
afc8839cea
am:
9b86fdb58e
Change-Id: Iec2d44e67ab7dbac045199fe0ffa5d5051e7528b
Pavlin Radoslavov [Fri, 7 Sep 2018 16:33:18 +0000 (09:33 -0700)]
[automerger skipped] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
2692408d05 am:
90d9589f1e
am:
746df692f0 -s ours
Change-Id: Iaf0899a8521801655b7e1f6e675d9e809739af06
Pavlin Radoslavov [Fri, 7 Sep 2018 16:28:48 +0000 (09:28 -0700)]
Merge changes from topic "bt-security-avrc_ctrl_pars_vendor_rsp-length-check-nyc-dev" into oc-dev am:
5e20d5088c
am:
afc8839cea
Change-Id: I4e91709896dcb3dd45f0565048a8c51e37e75b9b
Pavlin Radoslavov [Fri, 7 Sep 2018 16:28:22 +0000 (09:28 -0700)]
DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
2692408d05
am:
90d9589f1e
Change-Id: I22b0622f5496f5ee8e3de7d95734e0112ba6913f
Pavlin Radoslavov [Fri, 7 Sep 2018 16:25:50 +0000 (09:25 -0700)]
Merge changes from topic "bt-security-avrc_ctrl_pars_vendor_rsp-length-check-nyc-dev" into oc-dev
am:
5e20d5088c
Change-Id: Idfef0788a3a29602adbbe0e6cedf07868794e561
Pavlin Radoslavov [Fri, 7 Sep 2018 16:25:17 +0000 (09:25 -0700)]
DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp()
am:
2692408d05
Change-Id: I8c19a5d6eb81e758430707f203c1d75e46f8d064
TreeHugger Robot [Fri, 7 Sep 2018 16:15:19 +0000 (16:15 +0000)]
Merge changes from topic "bt-security-avrc_ctrl_pars_vendor_rsp-length-check-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf am:
c0e2026eb1 am:
eb2615a683 am:
38a6087b6a skipped:
df71e4a376
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf am:
c0e2026eb1 am:
eb2615a683 am:
38a6087b6a
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf am:
c0e2026eb1 am:
eb2615a683
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf am:
c0e2026eb1
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf
DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp()
Android Build Merger (Role) [Fri, 7 Sep 2018 04:59:55 +0000 (04:59 +0000)]
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf am:
c0e2026eb1 am:
eb2615a683 am:
38a6087b6a skipped:
df71e4a376
Change-Id: Ibe7f4bec37e68cf06ba39d0c8cce02ec7ba6fb18
Android Build Merger (Role) [Fri, 7 Sep 2018 04:59:53 +0000 (04:59 +0000)]
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf am:
c0e2026eb1 am:
eb2615a683 am:
38a6087b6a
Change-Id: I4663734017282372f8d93cb498b80098de609c72
Android Build Merger (Role) [Fri, 7 Sep 2018 04:59:51 +0000 (04:59 +0000)]
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf am:
c0e2026eb1 am:
eb2615a683
Change-Id: I99e38ee8048be6b98e0732fb32bffba78a81ae32
Android Build Merger (Role) [Fri, 7 Sep 2018 04:59:49 +0000 (04:59 +0000)]
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf am:
c0e2026eb1
Change-Id: I06ca49edef4db3a930150ba7a6b875d6727ae50d
Android Build Merger (Role) [Fri, 7 Sep 2018 04:59:47 +0000 (04:59 +0000)]
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf
Change-Id: I74cd9a6ffa3096d58b11092095b82f69fc94a3b7
Pavlin Radoslavov [Thu, 6 Sep 2018 22:41:27 +0000 (15:41 -0700)]
DO NOT MERGE - 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
2692408d05bf16738284b61833649cee5d2a2233)
Pavlin Radoslavov [Thu, 6 Sep 2018 22:41:27 +0000 (15:41 -0700)]
DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp()
Bug:
111450417
Test: PoC test program
Change-Id: Idd619e52dc7a2944d0d08af824505580e299c163
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)
TreeHugger Robot [Thu, 6 Sep 2018 23:22:29 +0000 (23:22 +0000)]
Merge "HID Device: Fix OOB in register_app" into pi-dev
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
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
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 nyc-mr2-dev
* changes:
[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
TreeHugger Robot [Fri, 10 Aug 2018 23:13:53 +0000 (23:13 +0000)]
Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into cw-f-dev
* changes:
[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
TreeHugger Robot [Fri, 10 Aug 2018 23:13:53 +0000 (23:13 +0000)]
Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into nyc-mr1-dev
* changes:
[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
TreeHugger Robot [Fri, 10 Aug 2018 23:13:53 +0000 (23:13 +0000)]
Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into nyc-dr1-dev
* changes:
[automerger] Checks the SMP length to fix OOB read am:
353faee793
Checks the SMP length to fix OOB read
TreeHugger Robot [Fri, 10 Aug 2018 23:13:53 +0000 (23:13 +0000)]
Merge "Checks the SMP length to fix OOB read" into nyc-dev
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 nyc-mr2-dev
* changes:
[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:55:20 +0000 (20:55 +0000)]
Merge changes from topic "am-
df95a56f-528f-434c-972e-
bb492348a21a" into cw-f-dev
* changes:
[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:55:20 +0000 (20:55 +0000)]
Merge changes from topic "am-
df95a56f-528f-434c-972e-
bb492348a21a" into nyc-mr1-dev
* changes:
[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:55:20 +0000 (20:55 +0000)]
Merge changes from topic "am-
df95a56f-528f-434c-972e-
bb492348a21a" into nyc-dr1-dev
* changes:
[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:55:20 +0000 (20:55 +0000)]
Merge "DO NOT MERGE Add packet length check in smp_proc_master_id" into nyc-dev
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 nyc-mr2-dev
* changes:
[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 20:06:42 +0000 (20:06 +0000)]
Merge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into cw-f-dev
* changes:
[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 20:06:42 +0000 (20:06 +0000)]
Merge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into nyc-mr1-dev
* changes:
[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 20:06:42 +0000 (20:06 +0000)]
Merge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into nyc-dr1-dev
* changes:
[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 20:06:42 +0000 (20:06 +0000)]
Merge "DO NOT MERGE: Add missing AVRCP message length checks inside avrc_msg_cback" into nyc-dev
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:52:34 +0000 (19:52 +0000)]
Merge changes from topic "am-
c2d9879f-e9d2-44f3-9012-
53037ab580a0" into nyc-mr2-dev
* changes:
[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:52:34 +0000 (19:52 +0000)]
Merge changes from topic "am-
c2d9879f-e9d2-44f3-9012-
53037ab580a0" into cw-f-dev
* changes:
[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:52:34 +0000 (19:52 +0000)]
Merge changes from topic "am-
c2d9879f-e9d2-44f3-9012-
53037ab580a0" into nyc-mr1-dev
* changes:
[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:52:34 +0000 (19:52 +0000)]
Merge changes from topic "am-
c2d9879f-e9d2-44f3-9012-
53037ab580a0" into nyc-dr1-dev
* changes:
[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:52:34 +0000 (19:52 +0000)]
Merge "DO NOT MERGE Check packet length in bta_av_proc_meta_cmd" into nyc-dev
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
TreeHugger Robot [Fri, 10 Aug 2018 19:43:29 +0000 (19:43 +0000)]
Merge changes from topic "am-
a988fd47-73ee-44e9-929f-
5374e8851656" into nyc-mr2-dev
* changes:
[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
TreeHugger Robot [Fri, 10 Aug 2018 19:43:29 +0000 (19:43 +0000)]
Merge changes from topic "am-
a988fd47-73ee-44e9-929f-
5374e8851656" into cw-f-dev
* changes:
[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
TreeHugger Robot [Fri, 10 Aug 2018 19:43:29 +0000 (19:43 +0000)]
Merge changes from topic "am-
a988fd47-73ee-44e9-929f-
5374e8851656" into nyc-mr1-dev
* changes:
[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
TreeHugger Robot [Fri, 10 Aug 2018 19:43:29 +0000 (19:43 +0000)]
Merge changes from topic "am-
a988fd47-73ee-44e9-929f-
5374e8851656" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE Fix OOB read before buffer length check am:
e64b4a38b0
DO NOT MERGE Fix OOB read before buffer length check
TreeHugger Robot [Fri, 10 Aug 2018 19:43:29 +0000 (19:43 +0000)]
Merge "DO NOT MERGE Fix OOB read before buffer length check" into nyc-dev
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