summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-16Merge cherrypicks of [8662136, 8662137, 8660337, 8660601, 8660073, 8660074, ↵android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r47android-10.0.0_r46android-10.0.0_r3android-10.0.0_r2android-10.0.0_r1android10-security-releaseandroid10-s1-releaseandroid-build-team Robot
8660602, 8662138, 8660127] into qt-release Change-Id: I4bc63b1a26d4586c8480b67b6343ec4009a0a4db
2019-07-16marlin: update kernel prebuiltWilson Sung
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)
2019-06-13Snap for 5656475 from 9f268756e9cb51f3d92f30a7e8c5df54b6f0fde2 to qt-releaseandroid-build-team Robot
Change-Id: I9ffe4940fc836b818bfa842b90bdd033eeac7ed4
2019-06-12marlin: update kernel prebuiltandroid10-devPetri Gynther
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>
2019-06-11Snap for 5649081 from 7d7fd3dca979775742f305049a59d70b0cf1a457 to qt-releaseandroid-build-team Robot
Change-Id: I28a219d6c00b5be4e5c261c90240ded75a35a9a3
2019-06-07marlin: update kernel prebuiltVishal Agarwal
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>
2019-06-06Snap for 5637134 from 3556b7c338af9cbd83555c6aa6845c48172e4f49 to qt-releaseandroid-build-team Robot
Change-Id: Iba2b6e760e852f7fd1c0a766b6e4c3b7eb8ae9e4
2019-06-05[automerger skipped] marlin: update kernel prebuilt [ DO NOT MERGE ]Vishal Agarwal
am: a8dc3f9131 -s ours am skip reason: subject contains skip directive Change-Id: I51225452574d961c17f967396a70b047aba85fce
2019-05-25Snap for 5605988 from 1a274ffeeb30ad97e7835181bcb8769482e5336b to qt-releaseandroid-build-team Robot
Change-Id: I698b0c35cc3c797c9c985878913ba6294c6f79ac
2019-05-23marlin: update kernel prebuiltPetri Gynther
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>
2019-05-18Snap for 5582428 from fefaf35f9462dbf9ee945c048ac2307cd7a6d265 to qt-releaseandroid-build-team Robot
Change-Id: I69855d32054b416de3c4e453d05c61c83def5cc7
2019-05-15marlin: update kernel prebuiltPetri Gynther
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>
2019-05-14Snap for 5563067 from c3e73f0df75ac331ab432dc907f17faeb0d19f05 to qt-releaseandroid-build-team Robot
Change-Id: I4ba4ee0dbab252027b6d0a23971979b58417d032
2019-05-12marlin: update kernel prebuiltPetri Gynther
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>
2019-05-10marlin: update kernel prebuilt [ DO NOT MERGE ]Vishal Agarwal
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>
2019-04-24Snap for 5499134 from e44097becd72ebc9538b69e02267e6d21578057d to qt-releaseandroid-build-team Robot
Change-Id: I734252a13bf385231a71c0d1cec4dfa4cc96cf11
2019-04-22marlin: update kernel prebuiltPetri Gynther
06f1743ee Merge branch 'android-msm-marlin-3.18-pi-qpr3' into android-msm-marlin-3.18 27a6e3d26 Merge branch 'android-msm-marlin-3.18-pi-qpr2' into android-msm-marlin-3.18-pi-qpr3 a43f6ab6a Merge branch 'android-msm-marlin-3.18-pi-qpr1' into android-msm-marlin-3.18-pi-qpr2 3dd3a4355 Merge branch 'android-msm-marlin-3.18-pi' into android-msm-marlin-3.18-pi-qpr1 0d83251e7 Merge branch 'android-msm-marlin-3.18-pi-security-next' into android-msm-marlin-3.18-pi 690aecf90 qcacld-2.0: Avoid int overflow in csrScanSavePreferredNetworkFound 20318ed0e qcacld-2.0: Avoid integer underflow in dot11f_unpack functions c97b4a0a0 msm: vidc: ensure codec count is in supported session range a1b88db1e qcacld-2.0: Fix possible buffer overflow in sirConvertAddtsRsp2Struct 7b388db6d msm: vidc: Ensure validity of shared Q indices b73fb19c5 tracing: fix race condition reading saved tgids 2aba0ddf1 FROMLIST: arm64: Build vDSO with -ffixed-x18 101bd5241 media: uvcvideo: Fix 'type' check leading to overflow ead8682a0 scsi: ufs: internal clean up b1d5f3e05 scsi: ufs: revert ufshcd_shutdown bd58f6ce4 scsi: ufs: revise commit 3b1c6a2b ("disallow SECURITY_PROTOCOL_IN without _OUT") da80b1b66 scsi: ufs: revise commit ecd2676bd513 ("disallow SECURITY_PROTOCOL_IN without _OUT") 1f855b8a7 scsi: ufs: fix shutdown race condition f09854220 scsi: ufs: error out all issued requests after shutdown cda441d5f Revert "scsi: ufs: stub UFS shutdown handler" 832656711 scsi: ufs: fix sleep in atomic context d83d48b67 scsi: ufs: Fix compilation error in ufs cmd logging 52c6b9bbe scsi: ufs: add support for logging custom events c23a5b040 scsi: ufs: fix the UFS command tracing events 57621a6d0 scsi: ufs: update ufs command logging infrastructure 22b404fe1 scsi: ufs: add command logging infrastructure a3d0c0b92 scsi: ufs: disallow SECURITY_PROTOCOL_IN without _OUT 100fecf05 scsi/ufs: print UFS health info in kernel log cf284d757 scsi: ufs: Add clock ungating to a separate workqueue 1fbf2ee61 scsi: ufs: fix typecasting in vendor quirk 4cf9aa6c8 scsi: ufs: fix race between hibern8 failure recovery and error handler 3f0e12b2e scsi: ufs-debugfs: add error state e8867a299 scsi: ufs: kick start clock scaling only after device detection a7b86a3d2 scsi: ufs-qcom: fix bug with read/modify write of UFS_CFG1 fb9a2fa58 scsi: ufs: disable clock scaling Linux version 3.18.137-g06f1743ee93b (android- build@wprn8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Apr 17 03:15:24 UTC 2019 Bug: 36007735 Bug: 78601190 Bug: 79898356 Bug: 111127989 Bug: 111760968 Bug: 112907825 Bug: 114073969 Bug: 114399807 Bug: 118444167 Bug: 118672487 Bug: 121178760 Bug: 122331452 Bug: 122478803 Bug: 123533258 Bug: 128798879 Bug: 128824063 Bug: 129964466 Change-Id: Iee3168b374844e5874b6a486149ce6b069ab9e53 Source-Branch: android-msm-marlin-3.18 Pick-Prebuilt: 244264687 Signed-off-by: Petri Gynther <pgynther@google.com>
2019-04-17Snap for 5476769 from 989c56afc09b61004145fc3cdd3009a13ed35cdb to qt-releaseandroid-build-team Robot
Change-Id: I122799e96016b2cb26a42b64ec417d600b09e71a
2019-04-16[automerger skipped] marlin: update kernel prebuilt [ DO NOT MERGE ]Kelly Rossmoyer
am: 07ccae279c -s ours am skip reason: subject contains skip directive Change-Id: Ic467ea4c6b7aa60b487e65fa275d56817b4040fc
2019-04-12marlin: update kernel prebuilt [ DO NOT MERGE ]Kelly Rossmoyer
27a6e3d26 Merge branch 'android-msm-marlin-3.18-pi-qpr2' into android-msm-marlin-3.18-pi-qpr3 a43f6ab6a Merge branch 'android-msm-marlin-3.18-pi-qpr1' into android-msm-marlin-3.18-pi-qpr2 3dd3a4355 Merge branch 'android-msm-marlin-3.18-pi' into android-msm-marlin-3.18-pi-qpr1 0d83251e7 Merge branch 'android-msm-marlin-3.18-pi-security-next' into android-msm-marlin-3.18-pi 690aecf90 qcacld-2.0: Avoid int overflow in csrScanSavePreferredNetworkFound 20318ed0e qcacld-2.0: Avoid integer underflow in dot11f_unpack functions c97b4a0a0 msm: vidc: ensure codec count is in supported session range a1b88db1e qcacld-2.0: Fix possible buffer overflow in sirConvertAddtsRsp2Struct 7b388db6d msm: vidc: Ensure validity of shared Q indices 2aba0ddf1 FROMLIST: arm64: Build vDSO with -ffixed-x18 101bd5241 media: uvcvideo: Fix 'type' check leading to overflow ead8682a0 scsi: ufs: internal clean up b1d5f3e05 scsi: ufs: revert ufshcd_shutdown bd58f6ce4 scsi: ufs: revise commit 3b1c6a2b ("disallow SECURITY_PROTOCOL_IN without _OUT") da80b1b66 scsi: ufs: revise commit ecd2676bd513 ("disallow SECURITY_PROTOCOL_IN without _OUT") 1f855b8a7 scsi: ufs: fix shutdown race condition f09854220 scsi: ufs: error out all issued requests after shutdown cda441d5f Revert "scsi: ufs: stub UFS shutdown handler" 832656711 scsi: ufs: fix sleep in atomic context d83d48b67 scsi: ufs: Fix compilation error in ufs cmd logging 52c6b9bbe scsi: ufs: add support for logging custom events c23a5b040 scsi: ufs: fix the UFS command tracing events 57621a6d0 scsi: ufs: update ufs command logging infrastructure 22b404fe1 scsi: ufs: add command logging infrastructure a3d0c0b92 scsi: ufs: disallow SECURITY_PROTOCOL_IN without _OUT 100fecf05 scsi/ufs: print UFS health info in kernel log cf284d757 scsi: ufs: Add clock ungating to a separate workqueue 1fbf2ee61 scsi: ufs: fix typecasting in vendor quirk 4cf9aa6c8 scsi: ufs: fix race between hibern8 failure recovery and error handler 3f0e12b2e scsi: ufs-debugfs: add error state e8867a299 scsi: ufs: kick start clock scaling only after device detection a7b86a3d2 scsi: ufs-qcom: fix bug with read/modify write of UFS_CFG1 fb9a2fa58 scsi: ufs: disable clock scaling Linux version 3.18.131-g27a6e3d260f4 (android- build@xpcc9.ams.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Apr 12 22:06:12 UTC 2019 Bug: 78601190 Bug: 79898356 Bug: 111127989 Bug: 111760968 Bug: 112907825 Bug: 114073969 Bug: 114399807 Bug: 118444167 Bug: 118672487 Bug: 121178760 Bug: 122331452 Bug: 122478803 Bug: 123533258 Bug: 128798879 Bug: 128824063 Bug: 129964466 Change-Id: I9ed98ab1facf4cffa8d310f7b97e6cb49ccc4b50 Source-Branch: android-msm-marlin-3.18-pi-qpr3 Pick-Prebuilt: 242588995 Signed-off-by: Kelly Rossmoyer <krossmo@google.com>
2019-04-04Snap for 5434517 from fe8e99bb6732965d1b7b768ead9d6038ec501add to qt-releaseandroid-build-team Robot
Change-Id: Ic29479c6689f179f087fdec36366b1f4b823be49
2019-04-03Merge master@5428150 into git_qt-dev. am: 347246902dBill Rassieur
am: 62be4e6009 Change-Id: I2d05bf3612de440c04d9fc925198b877926b9222
2019-04-03Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
am: 6b1488df5c Change-Id: I7c83f6c0380ec00d72ec570ebec81c50411166c9
2019-04-03Merge master@5428150 into git_qt-dev.Bill Rassieur
am: 347246902d Change-Id: Ica64d955704fc02d66e9f64985423e00d6678490
2019-04-02Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: I8448336664317444b37ea214b0daceddb66ef663 BUG: 129345239
2019-04-02Merge master@5428150 into git_qt-dev.Bill Rassieur
Change-Id: I741dc8c9441bf6515811b9b506020762e394c3fe BUG: 129345239
2019-04-02Snap for 5426495 from 25903353f3df4f23f623ad6a689351f2d1ed9cfd to qt-releaseandroid-build-team Robot
Change-Id: I75a803e2e81f75e3e66fd2ec10aebb0eade6f324
2019-04-01marlin: update kernel prebuiltPetri Gynther
c7efb62b8 SSM: Remove support for SSM driver a12ec6cb5 ANDROID: drop CONFIG_INPUT_KEYCHORD from all 31f0bf123 msm: msm_bus: Fix error handling in msm_bus_device_probe ff6136b6a msm: msm_bus: Fix error handling in msm_bus_device_init be01f7079 diag: Prevent out of bound access while initializing msg mask 3a7f9941c diag: Update mask pointers after reallocation 089f1c1e5 UPSTREAM: net: socket: set sock->sk to NULL after calling proto_ops::release() 2cae11710 BACKPORT: socket: close race condition between sock_close() and sockfs_setattr() 63bd20111 arm64/configs: marlin: simplify log buffer allocation ea290c9c0 diag: Add missing protection while accessing session's info 67fbaddb6 diag: Update mask buffer after reallocation 0d524d587 diag: Fix diag msg mask buffer overflow issue Linux version 3.18.137-gc7efb62b8e5b (android- build@wpho11.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Mon Apr 1 18:18:07 UTC 2019 Bug: 62711756 Bug: 64114943 Bug: 79217930 Bug: 80302295 Bug: 80435805 Bug: 118897119 Bug: 123497264 Bug: 125367761 Bug: 127786140 Bug: 129556081 Change-Id: I1a86ae77c2af428d7518548c13a79195918db61d Source-Branch: android-msm-marlin-3.18 Signed-off-by: Petri Gynther <pgynther@google.com>
2019-03-30Snap for 5422062 from 628551b3a607fd55c1698c495889bcfb0713ad0b to qt-releaseandroid-build-team Robot
Change-Id: Ide4495c53255cebf0e0bf669a96ec61eaa84cec8
2019-03-28Snap for 5413448 from 3dab49541a2711246edc087df8cd61a0c7e1ba16 to qt-releaseandroid-build-team Robot
Change-Id: I634643a221bcedd7bab29083b0a4e2bcc2f57475
2019-03-27marlin: update kernel prebuiltPetri Gynther
7c716c2e4 LTS: Merge 3.18.137 into android-msm-marlin-3.18 1b284d654 Merge 3.18.137 into android-msm-marlin-3.18-lts 24fbbeb15 Linux 3.18.137 0f404510f tmpfs: fix uninitialized return value in shmem_link 1f8ef009e drm/radeon/evergreen_cs: fix missing break in switch statement 920ee7817 media: uvcvideo: Avoid NULL pointer dereference at the end of streaming 73929a01c md: Fix failed allocation of md_register_thread 3127b10f2 nfsd: fix wrong check in write_v4_end_grace() 695cf5a1c nfsd: fix memory corruption caused by readdir 4d01d0bef ARM: s3c24xx: Fix boolean expressions in osiris_dvs_notify 86e74461b powerpc/83xx: Also save/restore SPRG4-7 during suspend 8302f8d9f powerpc/powernv: Make opal log only readable by root 251b9649c powerpc/wii: properly disable use of BATs when requested. e89f1814d powerpc/32: Clear on-stack exception marker upon exception return b30e5af1a jbd2: clear dirty flag when revoking a buffer from an older transaction b364a52e5 parport_pc: fix find_superio io compare code, should use equal test. 0c6ea710c kernel/sysctl.c: add missing range check in do_proc_dointvec_minmax_conv cc3dc9fd8 mm/vmalloc: fix size check for remap_vmalloc_range_partial() c7e272847 ext2: Fix underflow in ext2_max_size() 5df54f47c ext4: fix crash during online resizing 9c069be87 cpufreq: pxa2xx: remove incorrect __init annotation 51febb43d crypto: pcbc - remove bogus memcpy()s with src == dest 0ece4f706 Btrfs: fix corruption reading shared and compressed extents after hole punching 6086051bd m68k: Add -ffreestanding to CFLAGS c91bf13da scsi: target/iscsi: Avoid iscsit_release_commands_from_conn() deadlock dc22a2802 scsi: virtio_scsi: don't send sc payload with tmfs f6dc88286 regulator: s2mpa01: Fix step values for some LDOs c9807601d regulator: s2mps11: Fix steps for buck7, buck8 and LDO35 ed6d71db0 CIFS: Fix read after write for files with read caching 6439ade58 net: set static variable an initial value in atl2_probe() afeeaae3f tmpfs: fix link accounting when a tmpfile is linked in 7e7a77e27 arm64: Relax GIC version check during early boot a27a25af7 net: mv643xx_eth: disable clk on error path in mv643xx_eth_shared_probe() 4abfd43cd net: systemport: Fix reception of BPDUs a55576b3f scsi: libiscsi: Fix race between iscsi_xmit_task and iscsi_complete_task 103d3fba1 assoc_array: Fix shortcut creation 5c00ee71a Input: st-keyscan - fix potential zalloc NULL dereference 8086ef79d i2c: cadence: Fix the hold bit setting 3c05cf982 Input: matrix_keypad - use flush_delayed_work() fab8ee033 s390/dasd: fix using offset into zero size array error 5331f95d4 crypto: ahash - fix another early termination in hash walk 492290b43 ASoC: fsl_esai: fix register setting issue in RIGHT_J mode f314a706d 9p/net: fix memory leak in p9_client_create 010feb981 It's wrong to add len to sector_nr in raid10 reshape twice a7e24e00f ALSA: bebob: use more identical mod_alias for Saffire Pro 10 I/O against Liquid Saffire 56 415d81c3f gro_cells: make sure device is up in gro_cells_receive() c9978f642 net/hsr: fix possible crash in add_timer() 54e31274f vxlan: test dev->flags & IFF_UP before calling gro_cells_receive() 10a16ff0e missing barriers in some of unix_sock ->addr and ->path accesses b929a3603 net: Set rtm_table to RT_TABLE_COMPAT for ipv6 for tables > 255 077a35364 mdio_bus: Fix use-after-free on device_register fails f14e4744b net/x25: fix a race in x25_bind() 65b511dda net/mlx4_core: Fix qp mtt size calculation 223458ad0 pptp: dst_release sk_dst_cache in pptp_sock_destruct 0052542ed net/x25: reset state in x25_connect() 311d9ca2c net/x25: fix use-after-free in x25_device_event() 5f23b7a9f net: sit: fix UBSAN Undefined behaviour in check_6rd e3d6490ad net: hsr: fix memory leak in hsr_dev_finalize() af1285737 l2tp: fix infoleak in l2tp_ip6_recvmsg() 19d0200ab iscsi_ibft: Fix missing break in switch statement a91258c06 Input: wacom_serial4 - add support for Wacom ArtPad II tablet c8a52bb99 perf symbols: Filter out hidden symbols from labels 6acb293d7 s390/qeth: fix use-after-free in error path 3c26324ee dmaengine: dmatest: Abort test in case of mapping error 66a0097e4 irqchip/mmp: Only touch the PJ4 IRQ & FIQ bits on enable/disable c35a43a4a ARM: pxa: ssp: unneeded to free devm_ allocated data e098697e5 autofs: fix error return in autofs_fill_super() b581cd7a1 autofs: drop dentry reference only when it is never used a3f349195 mm, memory_hotplug: is_mem_section_removable do not pass the end of a zone 12c154964 x86/kexec: Don't setup EFI info if EFI runtime is not enabled 4b3cc96fa cifs: fix computation for MAX_SMB2_HDR_SIZE bdde0a895 platform/x86: Fix unmet dependency warning for SAMSUNG_Q10 36fb86505 scsi: libfc: free skb when receiving invalid flogi resp 03e8aa634 nfs: Fix NULL pointer dereference of dev_name ddd02ed66 net: altera_tse: fix msgdma_tx_completion on non-zero fill_level case 47bf7dbba xtensa: SMP: limit number of possible CPUs by NR_CPUS 245fa9e4c xtensa: SMP: mark each possible CPU as present d4e922c05 xtensa: smp_lx200_defconfig: fix vectors clash 1c0a5536b xtensa: SMP: fix secondary CPU initialization 83237244d iommu/amd: Fix IOMMU page flush when detach device from a domain c7b9cfdb7 ipvs: Fix signed integer overflow when setsockopt timeout aef2907d0 perf tools: Handle TOPOLOGY headers with no CPU ed5ade969 vti4: Fix a ipip packet processing bug in 'IPCOMP' virtual tunnel 7828fe745 media: uvcvideo: Fix 'type' check leading to overflow e37f1f915 hugetlbfs: fix races and page leaks during migration 28ee96bc2 ip6mr: Do not call __IP6_INC_STATS() from preemptible context c61d01faa netlabel: fix out-of-bounds memory accesses ffd0f56df net: phy: Micrel KSZ8061: link failure after cable connect 5202d2fb4 net: avoid use IPCB in cipso_v4_error b5cd9b572 net: Add __icmp_send helper. e89106985 net: nfc: Fix NULL dereference on nfc_llcp_build_tlv fails c152a71bf team: Free BPF filter when unregistering netdev 39915595c sky2: Disable MSI on Dell Inspiron 1545 and Gateway P-79 a7053bc3a net-sysfs: Fix mem leak in netdev_register_kobject 70628d623 USB: serial: cp210x: add ID for Ingenico 3070 f290a73f3 mm: enforce min addr even if capable() in expand_downwards() c3ccbb431 mmc: spi: Fix card detection during probe eea042978 KVM: nSVM: clear events pending from svm_complete_interrupts() when exiting to L1 1d26f9b68 cfg80211: extend range deviation for DMG a0b1e4d45 mac80211: don't initiate TDLS connection if station is not associated to AP Linux version 3.18.137-g7c716c2e46b5 (android- build@wprf7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Mar 27 18:49:29 UTC 2019 Bug: 115649896 Change-Id: Ibeb3aa3b8c9b80283c478f101684b8811baae76b Source-Branch: android-msm-marlin-3.18 Signed-off-by: Petri Gynther <pgynther@google.com>
2019-03-26marlin: update kernel prebuiltPetri Gynther
5bd00c26a ANDROID: sdcardfs: Add option to not link obb 97081a57a ANDROID: sdcardfs: Add sandbox b4487cae1 ANDROID: sdcardfs: Add option to drop unused dentries a6f55422f ANDROID: sdcardfs: fix potential crash when reserved_mb is not zero 51b0553ff ANDROID: sdcardfs: Don't d_drop in d_revalidate 3159d4a69 ANDROID: sdcardfs: Set s_root to NULL after putting 0b25b9fda ANDROID: sdcardfs: d_make_root calls iput 4adb39711 ANDROID: sdcardfs: Check for private data earlier ff7b0a768 ANDROID: sdcardfs: Fix sdcardfs to stop creating cases-sensitive duplicate entries. b9b626f23 ANDROID: sdcardfs: Set num in extension_details during make_item 14761b5ed ANDROID: sdcardfs: Hold i_mutex for i_size_write 6f9b4fd98 ANDROID: sdcardfs: override credential for ioctl to lower fs 46d7dbd6d ANDROID: sdcardfs: use mount_nodev and fix a issue in sdcardfs_kill_sb 13ecedaac ANDROID: sdcardfs: remove dead function open_flags_to_access_mode() b8371003f ANDROID: sdcardfs: d_splice_alias can return error values 72dd53c8a ANDROID: sdcardfs: Add linux/kref.h include 3c0e5e8ba diag: Fix possible usage of freed resource issue f70825c57 msm: ipa3: Add mutex to prevent race condition 203726c9b lpm-levels: Remove kfree for memory allocated with devm_kzalloc e0bda7b25 msm: camera: cpp: Check for valid tx level e0b189b85 soc: qcom: Reorganize PIL code for reclaiming MSS mem during SSR Linux version 3.18.136-g5bd00c26a99b (android- build@wprh8.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Mar 27 01:48:26 UTC 2019 Bug: 27915347 Bug: 62390017 Bug: 62916765 Bug: 63260873 Bug: 73055997 Bug: 73287721 Bug: 75987238 Bug: 77923821 Bug: 78262592 Bug: 79430883 Bug: 112277122 Bug: 116024809 Bug: 123162332 Change-Id: I998bd2326ecba24209416687a9db517df4741794 Source-Branch: android-msm-marlin-3.18 Signed-off-by: Petri Gynther <pgynther@google.com>
2019-03-21Snap for 5392835 from 565729105a6771bdfb63d68409b350e06a514b10 to qt-releaseandroid-build-team Robot
Change-Id: Ibd9c7d0317bbbd3b56cd5a7f8f83e11d88ea337c
2019-03-20marlin: update kernel prebuiltPetri Gynther
a0df7f379 qcacld-2.0: Check channel_count in DCC_GET_STATS command daf146747 qcacld-2.0: Fix integer overflow in wma_scpc_event_handler 14f495f8e qcacld-2.0: Fix integer overflow in wma_scpc_event_handler 1c922f660 qcacld-2.0: Fix possible integer underflow in cfg80211_rx_mgmt 2d90930a5 qcacld-2.0: check the data length when downloading firmware 698758bee qcacld-2.0: Check for minimum frameLen for action frames Linux version 3.18.136-ga0df7f379200 (android- build@wprb11.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Tue Mar 19 18:08:44 UTC 2019 Bug: 128343981 Bug: 128343982 Bug: 128344381 Bug: 128453359 Bug: 128453360 Bug: 128453665 Change-Id: Ic5ee3542146d323f0aac6562833fd7a80603e7be Source-Branch: android-msm-marlin-3.18 Signed-off-by: Petri Gynther <pgynther@google.com>
2019-03-14Snap for 5374457 from bf2da725f354dd6e5be4cf5c51e5b75c56171389 to qt-releaseandroid-build-team Robot
Change-Id: I38e8dcfc8e0ee84d42fe1f5ccee8f03f30ebc818
2019-03-13marlin: update kernel prebuiltEva Huang
775b52345 qseecom: set rcv_req_flag to 0 when listener is just registered 51f119d6f qseecom: do not wake up listener to receive request if it is not ready 7bcd4efc5 qseecom: check if listener is not ready to receive request 573e41e7d qseecom: set listener id before sending registration scm_call 36f38e672 qseecom: processing invalid listener request c9984c70a qseecom: change check_blocked flag to an u32 value 2c638b877 qseecom: check if app is blocked when unloading app 722e89b31 qseecom: abort all listener threads before listener unregistration a6335cf9e qseecom: add additonal reentrancy check before scm call 399f2c869 qcacld-2.0: Fix NULL pointer dereferencing in p2p TX MGMT Linux version 3.18.136-g775b523459f6 (android- build@wphr7.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Mar 13 06:48:07 UTC 2019 Bug: 123435533 Change-Id: I6ca51ce87790702f42806eba4ca43a261915ebee Source-Branch: android-msm-marlin-3.18 Signed-off-by: Eva Huang <evahuang@google.com>
2019-03-12[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: ↵Xin Li
38ba06836d -s ours am: 76e9337a78 -s ours am: d6f6a768f6 -s ours am skip reason: subject contains skip directive Change-Id: I416517e746f31628238982ff9d31c6870cdf2485
2019-03-12[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: ↵Xin Li
38ba06836d -s ours am: 76e9337a78 -s ours am skip reason: subject contains skip directive Change-Id: I2cad9cb669e5d57bd977210c44c2fbe3c41a5111
2019-03-12[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li
am: 38ba06836d -s ours am skip reason: subject contains skip directive Change-Id: I84d4932e12efe66622ec905851986e65b9f434d6
2019-03-12Snap for 5367932 from 43beb634d3650e8f51e5fe375d3addb04e3e9af1 to qt-releaseandroid-build-team Robot
Change-Id: Ia24bf3408fc12af4de71bc390b2ad892f5a69c81
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into ↵The Android Open Source Project
stage-aosp-master am: 4891636bbe -s ours am: d38adcdd4a -s ours am skip reason: subject contains skip directive Change-Id: I632fdc5c6a34acb6dd07baf840eccfab36c13536
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-masterThe Android Open Source Project
am: 4891636bbe -s ours am skip reason: subject contains skip directive Change-Id: If382992bc0e518cf4af0d17ab47cb40dd7d383f1
2019-03-11DO NOT MERGE - Merge PPRL.190305.001 into masterandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseXin Li
Bug: 127812889 Change-Id: Ib7158d2795520439f5cc3346a66c189892a29d94
2019-03-10Snap for 5364434 from 2d382ee263f1aa553cc78b6de793fd2c0015ff75 to qt-releaseandroid-build-team Robot
Change-Id: I2d9038503e123f73063c62452f8affe12db3617d
2019-03-08DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-masterThe Android Open Source Project
Bug: 127812889 Change-Id: I5e6534aa737a2d7fd0e68488a3d8b0a02a43454c
2019-03-08Snap for 5240760 from 7bbd9ea92c2a2f7492102a4fefc01d4cd7d54098 to ↵android-build-team Robot
pi-platform-release Change-Id: I267a2d243524531e1117e3b590ba106adbcd8f50
2019-03-07[automerger skipped] marlin: update kernel prebuilt [ DO NOT MERGE ] am: ↵Harrison Lingren
d8455c208c am: 5022c74f8b -s ours am skip reason: subject contains skip directive Change-Id: I400054eb7502f0c772406a094db48dd4adfadbc1
2019-03-07marlin: update kernel prebuilt [ DO NOT MERGE ]Harrison Lingren
am: d8455c208c Change-Id: If0f2815e23bd0dffdd237a7d9250fb59bfbb7e6b
2019-03-07marlin: update kernel prebuilt [ DO NOT MERGE ]Harrison Lingren
021e5400c Merge branch 'android-msm-marlin-3.18-pi-qpr2' into android-msm-marlin-3.18-pi-qpr3 9e8804e3a Merge branch 'android-msm-marlin-3.18-pi-qpr1' into android-msm-marlin-3.18-pi-qpr2 dcfd115a3 Merge branch 'android-msm-marlin-3.18-pi' into android-msm-marlin-3.18-pi-qpr1 2db7ee588 Merge branch 'android-msm-marlin-3.18-pi-security-next' into android-msm-marlin-3.18-pi 8a1dd35a8 msm:ipa:Prevent rt rule deletion if rt rule id is invalid cebcb3bb8 UPSTREAM: seccomp: Fix tracer exit notifications during fatal signals 357104de5 UPSTREAM: arm64/ptrace: run seccomp after ptrace bac2f2dde UPSTREAM: arm/ptrace: run seccomp after ptrace 7734d5abc BACKPORT: x86/ptrace: run seccomp after ptrace 5ae321ce0 UPSTREAM: seccomp: recheck the syscall after RET_TRACE 450b2551a BACKPORT: seccomp: remove 2-phase API d23b5e7e8 BACKPORT: x86/entry: Get rid of two-phase syscall entry work 33f5077dc BACKPORT: seccomp: Add a seccomp_data parameter secure_computing() 6a2409120 BACKPORT: x86/entry/64: Always run ptregs-using syscalls on the slow path d3d92a6a9 BACKPORT: x86/syscalls: Add syscall entry qualifiers 52bd7fc2d BACKPORT: x86/syscalls: Move compat syscall entry handling into syscalltbl.sh c97dd82f8 BACKPORT: x86/syscalls: Remove __SYSCALL_COMMON and __SYSCALL_X32 c13dcfc3c UPSTREAM: x86/syscalls: Refactor syscalltbl.sh 1bfa0f6cb qcacld-2.0: Fix OOB read in limProcessDeauthFrame Linux version 3.18.131-g021e5400cb88 (android- build@wphp1.hot.corp.google.com) (gcc version 4.9.x 20150123 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Mar 6 03:19:07 UTC 2019 Bug: 78528839 Bug: 119769499 Bug: 120486022 Bug: 124464469 Change-Id: I1b3de73bdfbab9e300e76f7c358e89e4377e466a Source-Branch: android-msm-marlin-3.18-pi-qpr3 Signed-off-by: Maggie White <maggiewhite@google.com> Signed-off-by: Harrison Lingren <hlingren@google.com>
2019-03-06Snap for 5354487 from 1141eabfef3d80b20f8ae4263047368ac8d2fc37 to qt-releaseandroid-build-team Robot
Change-Id: Id7b83d5237ae41bf9ab5b75107ce1cf6667b8145
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 10:13:58 +0000