Age | Commit message (Collapse) | Author |
|
Bug: 142297020
Merged-In: If66f00aac018515b8d5774e07ca4cc7911b288fc
Change-Id: Ic46ba8bae31dbd6b0a49979a283aaa9d3059220b
|
|
Bug: 139893257
Change-Id: If66f00aac018515b8d5774e07ca4cc7911b288fc
|
|
Bug: 139893257
Change-Id: I85b20939ce3aa8119f7cf360a6dc046180f1e350
|
|
Bug: 139893257
Change-Id: I8598cdf4271250b1d8e32c7852b548ad26fc0fb7
|
|
9200505, 9200585, 9200475, 9200586, 9200476, 9200588, 9200589, 9200639] into qt-release
Change-Id: I463d0e1b8d698c42046342517290bde7de9307dc
|
|
51348c59c3d4 Merge branch 'android-msm-marlin-3.18-security-next' into android-msm-marlin-3.18
aa414244c842 soc: qcom: Remove smp2p test support
a9affd81cd0a soc: qcom: Remove smp2p test support
04ed0031f496 qcacld-2.0: Process DO_ACS vendor command only in SAP/P2P_GO mode
265077b7197c qcacld-2.0: Fix OOB access in htt_rx_ring_fill_n
b961454e5240 soc: qcom: Remove smp2p test support
57d09ad8e243 qcacld-2.0: Possible OOB access in wlan_hdd_cfg80211_start_bss()
72329a8f1c4a qcacld-2.0: Fix potential OOB read when indicate mgmt frame
3d5ba03afde8 qcacld-2.0: Update public action frames to supplicant
Linux version 3.18.137-g51348c59c3d4 (android-
build@wphq7.hot.corp.google.com) (gcc version 4.9.x 20150123
(prerelease) (GCC) ) #1 SMP PREEMPT Sun Aug 11 22:43:53 UTC 2019
Bug: 73173201
Bug: 111126532
Bug: 112432329
Bug: 122475456
Bug: 127512519
Bug: 137800028
Bug: 139157579
Bug: 139202417
Change-Id: Ia0a1773c05b2119bbed2a03bb70970d8e4551e1f
Pick-Prebuilt: 262138504
Source-Branch: android-msm-marlin-3.18
Signed-off-by: Harrison Lingren <hlingren@google.com>
Test: PTS, VTS-kernel
(cherry picked from commit 303c7a93fff06aeb68cceb8211b54b3786150b8e)
|
|
stage-aosp-master
Bug: 134405016
Change-Id: Ib95ce2d2377092e6ff75151eacb98e516a4d06ff
|
|
8660602, 8662138, 8660127] into qt-release
Change-Id: I4bc63b1a26d4586c8480b67b6343ec4009a0a4db
|
|
382d7256ce44 Merge branch 'android-msm-marlin-3.18-security-next' into android-msm-marlin-3.18
b958c2c73702 UPSTREAM: binder: check for overflow when alloc for security context
3a3f23c245c6 drivers: soc: qcom: Added check to avoid opening multiple instance
2a9566dd672c drivers: soc: Synchronize apr callback and voice svc release
3ab06f3550a8 diag: dci: Validate dci client entries prior read
33444ecc5b33 lsm: check payload size validity before using it as array index
3bafce5c6a11 dsp: asm: validate payload size before access
91d34f382520 msm: kgsl: Fix race condition while making page as dirty
32acd914982f msm: camera_v2: handle the error value returned during get clock
Linux version 3.18.137-g382d7256ce44 (android-build@abfarm700) (gcc
version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Jul
12 06:00:07 UTC 2019
Bug: 130571081
Bug: 132171963
Bug: 132173298
Bug: 134439528
Bug: 134439992
Bug: 134440011
Bug: 134440735
Bug: 136171073
Change-Id: I96127696e04e067e2dd8116eeb30dca569791500
Pick-Prebuilt: 255958347
Source-Branch: android-msm-marlin-3.18
Signed-off-by: Wilson Sung <wilsonsung@google.com>
(cherry picked from commit 1545ddc216b4680bc656a2961f93ac4cceecb30a)
|
|
(PPRL.190705.004) into master
am: fa85d42dad -s ours
am skip reason: subject contains skip directive
Change-Id: I61fdfe1c4e7f150938548577953bee5ea0bd87c9
|
|
Bug: 136196576
Change-Id: Ibc93f4481fa05c2b567aa5566390e965852c7615
|
|
pi-platform-release
Change-Id: Ia85f587586f17ae84648eb470a7f92a63080db20
|
|
pi-platform-release
Change-Id: I41c4f2fd68bfc7700539479f80180d3da8683683
|
|
(5699924) into stage-aosp-master
am: 7524d76c0e -s ours
am skip reason: subject contains skip directive
Change-Id: I2feabfe0834d981ec3c84cbe0ecff9682c6a5031
|
|
stage-aosp-master
Bug: 134405016
Change-Id: Ie8007e7ab0243b2aab2fc4d3cac09d8e44b06988
|
|
Change-Id: I9ffe4940fc836b818bfa842b90bdd033eeac7ed4
|
|
am: 9f268756e9
Change-Id: If13198ebeecb197650929bf24fdddc09e038ccfe
|
|
9414e6c5024a arm64/configs: marlin: Expand USB HID game controller support
0a35ed32a403 iommu: do not attempt reclaim on higher order allocs
Linux version 3.18.137-g9414e6c5024a (android-
build@wprn1.hot.corp.google.com) (gcc version 4.9.x 20150123
(prerelease) (GCC) ) #1 SMP PREEMPT Wed Jun 12 20:54:59 UTC 2019
Bug: 122273348
Bug: 130357427
Bug: 130426072
Change-Id: If547ad1fa9fd3547ceaf1400d78c58c904b72004
Pick-Prebuilt: 251242232
Source-Branch: android-msm-marlin-3.18
Signed-off-by: Petri Gynther <pgynther@google.com>
|
|
Change-Id: I28a219d6c00b5be4e5c261c90240ded75a35a9a3
|
|
am: 7d7fd3dca9
Change-Id: I980c8a290d32ea8b49bdb7449c3927cf44fc0c11
|
|
(PPRL.190605.003) into master am: d58bdeb1ce -s ours
am: 3711f36936 -s ours
am skip reason: subject contains skip directive
Change-Id: I65a556502af8bf0e3ed4bc31c7aa2c160833f052
|
|
(PPRL.190605.003) into master
am: d58bdeb1ce -s ours
am skip reason: subject contains skip directive
Change-Id: Id2427eee020525e9a4b57d8bb89156cebfca3d9a
|
|
Bug: 134605042
Change-Id: I6f63d7f9e5673f40f367c08fe74128f5391731a5
|
|
91ae9df2a6d6 Merge branch 'android-msm-marlin-3.18-security-next' into android-msm-marlin-3.18
23b6e16b8224 msm: jpegdma: Fix for ASAN issues in jpegdma module
a81bb5e30c88 i2c: core-smbus: prevent stack corruption on read I2C_BLOCK_DATA
ca8c8218a6ec qseecom: fix kclient free issue in qseecom_remove
24170e56f213 dsp: q6voice: Check size of shared memory buffer before access
05f8c1c5bdd2 ASoC: msm: qdsp6v2: add range check for audio port index
1f408d849ec8 msm: ice: check for crypto engine availability
8de573362e9f dsp: codecs: fix range check for audio buffer copying
b29336d7754e fbdev/msm: sanitize debugfs inputs when reading mdp memory
18e3e92caf9f soc: qcom: Return error in case of invalid input
d8c123474703 msm: ipa: Fix to validate the buffer size
fc1b69859fad net: ipc_router: Initialize the sockaddr in recvmsg() handler
e467231c2fe6 qdsp6v2: apr: check for packet size to header size comparison
b6a9ace6596d msm: asm: validate ADSP data before access
a127e382040a msm: adsprpc: destroy mutex before file free
3e73a5bc1063 ARM: dts: msm: Untrusted pointer dereference
792461b5ffac msm: ipa: Add NULL check before dereference
4ac8a1b3122d soc: qcom: Validate read and write index before calculating ptr
Linux version 3.18.137-g91ae9df2a6d6 (android-
build@wpds2.hot.corp.google.com) (gcc version 4.9.x 20150123
(prerelease) (GCC) ) #1 SMP PREEMPT Fri Jun 7 20:48:26 UTC 2019
Bug: 109697864
Bug: 110849476
Bug: 114041748
Bug: 119052383
Bug: 119053530
Bug: 127513124
Bug: 129148475
Bug: 130880597
Bug: 132171784
Bug: 132171785
Bug: 132171964
Bug: 132172264
Bug: 132172905
Bug: 132173296
Bug: 132173424
Bug: 134573185
Change-Id: Ib7349c5c645a0bba36709d2981f00a1009d37e73
Pick-Prebuilt: 251242232
Source-Branch: android-msm-marlin-3.18
Signed-off-by: Vishal Agarwal <agarwalvishal@google.com>
|
|
(PPRL.190605.003) into stage-aosp-master
am: 413e7be0f6 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib9515e79ee4e3bb0df46f2fd1206740a99c0567d
|
|
Change-Id: Iba2b6e760e852f7fd1c0a766b6e4c3b7eb8ae9e4
|
|
stage-aosp-master
Bug: 134605042
Change-Id: If992406384e804579b9c65506518f64c9e22b437
|
|
a8dc3f9131 -s ours
am: 3556b7c338
Change-Id: I8be37b824c73bed5ce538ebc34fa4a00a337262c
|
|
am: a8dc3f9131 -s ours
am skip reason: subject contains skip directive
Change-Id: I51225452574d961c17f967396a70b047aba85fce
|
|
pi-platform-release
Change-Id: Ibc619600c7395e7ced945cf3b6dc76d2cf70cdce
|
|
Change-Id: I698b0c35cc3c797c9c985878913ba6294c6f79ac
|
|
am: 1a274ffeeb
Change-Id: Id9e784d8193edd739ca051ac97b63b61b58256d6
|
|
f3e6e9a54 Merge android-msm-marlin-3.18-security-next into android-msm-marlin-3.18
adeab47be qcacld-2.0: OOB read while processing extscan change results
Linux version 3.18.137-gf3e6e9a54583 (android-
build@wprm6.hot.corp.google.com) (gcc version 4.9.x 20150123
(prerelease) (GCC) ) #1 SMP PREEMPT Tue May 21 04:12:56 UTC 2019
Bug: 130028208
Change-Id: I373a0f028c6635278cca8c213422ee4ec881ebbf
Pick-Prebuilt: 248455242
Source-Branch: android-msm-marlin-3.18
Pick-Prebuilt: 248455242
Signed-off-by: Petri Gynther <pgynther@google.com>
|
|
Change-Id: I69855d32054b416de3c4e453d05c61c83def5cc7
|
|
(PPRL.190505.001) into master. am: 603e8a49b7 -s ours
am: 45bea37eb9 -s ours
am skip reason: subject contains skip directive
Change-Id: Iffc053d335f982f8af7c913bab6a892606efbd3c
|
|
(PPRL.190505.001) into master.
am: 603e8a49b7 -s ours
am skip reason: subject contains skip directive
Change-Id: Idcde5dacf57901af7202e516ce18f6a4c8871a3c
|
|
am: fefaf35f94
Change-Id: I6e9371bee5c095353526c4c8c0c9ea3f04e0fe03
|
|
(PPRL.190505.001) into stage-aosp-master
am: 71de7f7150 -s ours
am skip reason: subject contains skip directive
Change-Id: I8a07d0a96b992e0fc47b71221a9a6432ad5c2fbe
|
|
Bug: 132622481
Change-Id: Ia07c069955f50612b6068a004463ec8fb9ef91be
|
|
43fc53d22 qcacld-2.0: Check ac in limSetEdcaBcastACMFlag
Linux version 3.18.137-g43fc53d223fd (android-build@abfarm365) (gcc
version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Tue May
14 02:45:03 UTC 2019
Bug: 130054158
Change-Id: I45f2d568cd28aed45e44b069e4aa32cd2be0031c
Pick-Prebuilt: 247612761
Source-Branch: android-msm-marlin-3.18
Pick-Prebuilt: 247612761
Signed-off-by: Petri Gynther <pgynther@google.com>
|
|
7509264, 7508935, 7508630, 7508631, 7508632, 7508633, 7508634, 7509319, 7508937, 7508841, 7509320, 7508842] into pi-qpr3-release
Change-Id: I18d2b02e5c50460fce67f4cf09530ba6569d63ea
|
|
a2426c4f8 Merge branch 'android-msm-marlin-3.18-pi-qpr2' into android-msm-marlin-3.18-pi-qpr3
8f758baf2 Merge branch 'android-msm-marlin-3.18-pi-qpr1' into android-msm-marlin-3.18-pi-qpr2
2e5cb9dfd Merge branch 'android-msm-marlin-3.18-pi' into android-msm-marlin-3.18-pi-qpr1
79c9015de Merge branch 'android-msm-marlin-3.18-pi-security-next' into android-msm-marlin-3.18-pi
2a53f55b7 dsp: asm: Add check for num_channels before calling q6asm_map_channels
b9e963d97 qcacld-2.0: Fix possible OOB access in limProcessDisassocFrame
0da214450 qcacld-2.0: Fix possible integer underflow in cfg80211_rx_mgmt
29f93f41d dsp: validate token before usage as array index
6ef3b69bf qcacld-2.0: Fix OOB read in sme_RrmProcessBeaconReportReqInd
Linux version 3.18.131-ga2426c4f8f23 (android-
build@wprn6.hot.corp.google.com) (gcc version 4.9.x 20150123
(prerelease) (GCC) ) #1 SMP PREEMPT Fri May 10 20:32:26 UTC 2019
Bug: 78530292
Bug: 129850483
Bug: 129850941
Bug: 129851238
Bug: 130890737
Bug: 131238123
Change-Id: I3be5b2a3b99e7ca38a908da0d958417b50e68add
Pick-Prebuilt: 247612761
Source-Branch: android-msm-marlin-3.18-pi-qpr3
Pick-Prebuilt: 247612761
Signed-off-by: Vishal Agarwal <agarwalvishal@google.com>
(cherry picked from commit a8dc3f9131b866d7415858b44deaa10218b19c7c)
|
|
Change-Id: I4ba4ee0dbab252027b6d0a23971979b58417d032
|
|
stage-aosp-master
Bug: 132622481
Change-Id: I499241aceeb310cb4c8d04830994a64df781c413
|
|
am: c3e73f0df7
Change-Id: Id19848fab56096b85b84bb0bd1cce95792b6734a
|
|
d74b074a4 Merge branch 'android-msm-marlin-3.18-pi-qpr3' into android-msm-marlin-3.18
cf6b63a03 touchscreen: synaptics_dsx: prevent NULL pointer dereference
a2426c4f8 Merge branch 'android-msm-marlin-3.18-pi-qpr2' into android-msm-marlin-3.18-pi-qpr3
8f758baf2 Merge branch 'android-msm-marlin-3.18-pi-qpr1' into android-msm-marlin-3.18-pi-qpr2
2e5cb9dfd Merge branch 'android-msm-marlin-3.18-pi' into android-msm-marlin-3.18-pi-qpr1
79c9015de Merge branch 'android-msm-marlin-3.18-pi-security-next' into android-msm-marlin-3.18-pi
2a53f55b7 dsp: asm: Add check for num_channels before calling q6asm_map_channels
b9e963d97 qcacld-2.0: Fix possible OOB access in limProcessDisassocFrame
0da214450 qcacld-2.0: Fix possible integer underflow in cfg80211_rx_mgmt
29f93f41d dsp: validate token before usage as array index
6ef3b69bf qcacld-2.0: Fix OOB read in sme_RrmProcessBeaconReportReqInd
989acb04b iommu: dma-mapping-fast: Add a check for count in fast_smmu_alloc
Linux version 3.18.137-gd74b074a4c76 (android-
build@wphs10.hot.corp.google.com) (gcc version 4.9.x 20150123
(prerelease) (GCC) ) #1 SMP PREEMPT Sat May 11 00:13:16 UTC 2019
Bug: 36696768
Bug: 37755815
Bug: 62673086
Bug: 78530292
Bug: 116872291
Bug: 129850483
Bug: 129850941
Bug: 129851238
Bug: 130890737
Bug: 131238123
Change-Id: I9d6bb30e3582c815cc4d9d1b933dc129f9c1d170
Pick-Prebuilt: 247612761
Source-Branch: android-msm-marlin-3.18
Pick-Prebuilt: 247612761
Signed-off-by: Petri Gynther <pgynther@google.com>
|
|
a2426c4f8 Merge branch 'android-msm-marlin-3.18-pi-qpr2' into android-msm-marlin-3.18-pi-qpr3
8f758baf2 Merge branch 'android-msm-marlin-3.18-pi-qpr1' into android-msm-marlin-3.18-pi-qpr2
2e5cb9dfd Merge branch 'android-msm-marlin-3.18-pi' into android-msm-marlin-3.18-pi-qpr1
79c9015de Merge branch 'android-msm-marlin-3.18-pi-security-next' into android-msm-marlin-3.18-pi
2a53f55b7 dsp: asm: Add check for num_channels before calling q6asm_map_channels
b9e963d97 qcacld-2.0: Fix possible OOB access in limProcessDisassocFrame
0da214450 qcacld-2.0: Fix possible integer underflow in cfg80211_rx_mgmt
29f93f41d dsp: validate token before usage as array index
6ef3b69bf qcacld-2.0: Fix OOB read in sme_RrmProcessBeaconReportReqInd
Linux version 3.18.131-ga2426c4f8f23 (android-
build@wprn6.hot.corp.google.com) (gcc version 4.9.x 20150123
(prerelease) (GCC) ) #1 SMP PREEMPT Fri May 10 20:32:26 UTC 2019
Bug: 78530292
Bug: 129850483
Bug: 129850941
Bug: 129851238
Bug: 130890737
Bug: 131238123
Change-Id: I3be5b2a3b99e7ca38a908da0d958417b50e68add
Pick-Prebuilt: 247612761
Source-Branch: android-msm-marlin-3.18-pi-qpr3
Pick-Prebuilt: 247612761
Signed-off-by: Vishal Agarwal <agarwalvishal@google.com>
|
|
pi-platform-release
Change-Id: I2da7daf83173e5a0c80ccc0b7a47321336863875
|
|
pi-qpr3-b-release
Change-Id: Ib615fa37d8484fbec23f3d48b9c8d22ddfb59b01
|
|
Change-Id: I734252a13bf385231a71c0d1cec4dfa4cc96cf11
|