Merge Kernel into oc-mr1-release
marlin: update kernel prebuilt [ DO NOT MERGE ]
0de871268 Merge branch 'android-msm-marlin-3.18-oc-mr1-security-next' into android-msm-marlin-3.18-oc-mr1
1d9eca18d arm64: mm: update uaccess_disable_no_uao hack in __dma_flush_range
0d5ff39d4 FROMLIST: arm64: kpti: Fix the interaction between ASID switching and software PAN
8a8720ef3 FROMLIST: arm64: Move post_ttbr_update_workaround to C code
290ebe326 Merge branch 'android-msm-marlin-3.18-oc-mr1-security-next' into android-msm-marlin-3.18-oc-mr1
e9ce9f4e8 arm64: Kconfig: Reword UNMAP_KERNEL_AT_EL0 kconfig entry
1fcc115d9 arm64: use RET instruction for exiting the trampoline
8be32643e arm64: kaslr: Put kernel vectors address in separate data page
e28406c3a arm64: mm: Introduce TTBR_ASID_MASK for getting at the ASID in the TTBR
c140818af arm64: entry: Add fake CPU feature for unmapping the kernel at EL0
b9bb63aae arm64: tls: Avoid unconditional zeroing of tpidrro_el0 for native tasks
d9bd1fec8 arm64: erratum: Work around Falkor erratum #E1003 in trampoline code
a9e7f2197 arm64: entry: Hook up entry trampoline to exception vectors
602e3e426 arm64: entry: Explicitly pass exception level to kernel_ventry macro
59684a875 arm64: mm: Map entry trampoline into trampoline and kernel page tables
e58257fdc arm64: entry: Add exception trampoline page for exceptions from EL0
c24bcee0e arm64: mm: Invalidate both kernel and user ASIDs when performing TLBI
e88e2725e arm64: mm: Add arm64_kernel_unmapped_at_el0 helper
b964be925 arm64: mm: Allocate ASIDs in pairs
3b97df6e1 arm64: mm: update uaccess_ttbr0_enable hack in __dma_flush_range
684c01f21 arm64: mm: Fix and re-enable ARM64_SW_TTBR0_PAN
7b12761b4 arm64: mm: Move ASID from TTBR0 to TTBR1
a43e3fa99 arm64: mm: Temporarily disable ARM64_SW_TTBR0_PAN
3b55471bf arm64: mm: Use non-global mappings for kernel space
4bc9e7309 arm64: Kconfig: Add CONFIG_UNMAP_KERNEL_AT_EL0
531e13c2e UPSTREAM: arm64: introduce mov_q macro to move a constant into a 64-bit register
506850f49 UPSTREAM: arm64: tlbflush.h: add __tlbi() macro
76aa656e1 UPSTREAM: arm64: factor out entry stack manipulation
50f16b403 ANDROID: arm64: fix potential __cpu_suspend() bug in PAN backport
915435e64 UPSTREAM: arm64: mm: keep reserved ASIDs in sync with mm after multiple rollovers
3ad2381e5 UPSTREAM: arm64: Disable PAN on uaccess_enable()
b827adbb0 UPSTREAM: arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN
601aa3159 UPSTREAM: arm64: xen: Enable user access before a privcmd hvc call
3f0fb6adb UPSTREAM: arm64: Handle faults caused by inadvertent user access with PAN enabled
dc6ff5517 BACKPORT: arm64: Disable TTBR0_EL1 during normal kernel execution
0e750b6d3 BACKPORT: arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1
528da019c BACKPORT: arm64: Factor out PAN enabling/disabling into separate uaccess_* macros
e36684ba2 UPSTREAM: arm64: alternative: add auto-nop infrastructure
995f2efbe BACKPORT: arm64: barriers: introduce nops and __nops macros for NOP sequences
d86025f05 Revert "FROMLIST: arm64: Factor out PAN enabling/disabling into separate uaccess_* macros"
0aada4f20 Revert "FROMLIST: arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1"
0eaaabd1c Revert "FROMLIST: arm64: Disable TTBR0_EL1 during normal kernel execution"
a6cd1cc67 Revert "FROMLIST: arm64: Handle faults caused by inadvertent user access with PAN enabled"
d5c2e393c Revert "FROMLIST: arm64: xen: Enable user access before a privcmd hvc call"
9bea83fbc Revert "FROMLIST: arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN"
803b7e8e6 qcacld-2.0: Add sanity check to limit mgmt frames data len
4fbde1baa msm:ipa: Fix to incorrect structure access
a2de545c9 msm: sensor: flash: add conditional check for ioctl
91bd7d2c3 qcacld-2.0: Avoid OEM message overread
4ccea2ee5 ASoC: msm: qdsp6v2: Set freed pointers to NULL
5544e6d61 diag: Add protection while de-initializing clients
bc2b7c8ae qcacld-2.0: Fix out-of-bounds access in limProcessActionFrameNoSession
870fac6d4 qcacld-2.0: Check for upper bound in P2P NOA event
65ffdb283 qcacld-2.0: Check for the max number of P2P NOA descriptors
60889e1ee qcacld-2.0: Check for valid vdev ID in wma_nlo_match_evt_handler
0c35c1657 qcacld-2.0: Avoid possible buffer overwrite in wma_process_utf_event
f2f1e8dba UPSTREAM: ALSA: usb-audio: Kill stray URB at exiting
c1731f51c UPSTREAM: ALSA: usb-audio: Check out-of-bounds access by corrupted buffer descriptor
e7ea56e84 USB: uas: fix bug in handling of alternate settings
fd727e05b UPSTREAM: USB: fix out-of-bounds in usb_set_configuration
36c682771 UPSTREAM: HID: usbhid: fix out-of-bounds bug
4eb3df594 power: qcom: msm-core: Add mutex lock for ioctl
4113d85a8 qcacld-2.0: Fix int overflow in wma_unified_link_peer_stats_event_handler
db1b40139 qcacld-2.0: Check vdev_id against wma->max_bssid
67ee561a4 diag: Add mutex protection while reading dci debug statistics
f95293354 qcacld-2.0: Fix Integer overflow with latest framesc_linux tool
c6cec8540 qcacld-2.0: Avoid integer overflow in lim_update_ibss_prop_add_ies
b8f30f1e5 qcacld-2.0: Fix the size of array ch_list in sme_set_plm_request
674349727 qcacld-2.0: Add sanity check to avoid overflow in WMI event data
8018564f6 qcacld-2.0: Fix potential buffer overwrite in wma_roam_synch_event_handler
ae7edb3ab qcacld-2.0: Add sanity check to avoid len overflow issue in WMI event data
923a9ebb4 BACKPORT: blk-mq: fix race between timeout and freeing request
58e76821a ANDROID: sound: rawmidi: Hold lock around realloc
b2e34211f rtac: add size check when reading cal data kvaddr buffer
6bc68c78e ANDROID: qtaguid: Fix the UAF probelm with tag_ref_tree
0fb1212e6 msm: camera: Return -NOTTY on invalid ioctl command.
86f666744 ALSA: seq: Fix use-after-free at creating a port
5df5d9376 qcacld-2.0: Change local variables to dynamic in limProcessAuthFrame
3b40e85a2 qcacld-2.0: Prevent buffer overflow
0521adf11 qcacld-2.0: Fix int overflow in wma_unified_link_radio_stats_event_handler
c92abcd8d msm: kgsl: Fixing an uninitialized variable in _gpuobj_map_useraddr()
067333dfe ASoC: msm: qdsp6v2: Fix dangling pointer access
4dd170c8e msm: mdss: Fix potential race condition in rotator
16415830a msm:ipa: Fix to kasan use-after-free issue
28c4d03a3 msm: ipa: Fix to use after free issue
d184e5bd9 FROMLIST: input: synaptics_dsx: remove unused synaptics touch screen driver files
4f40763da qcacld-2.0: Fix to propagate key-receiver-sequence-counter to WMA
17f03b877 qcacld-2.0: Propagate key sequence counter to SME
d142c65d7 iovec: make sure the caller actually wants anything in memcpy_fromiovecend
224720481 Merge branch 'android-msm-marlin-3.18-oc-mr1' into android-msm-marlin-3.18-oc-mr1-security-next
520f6ebe6 Merge branch 'android-msm-marlin-3.18-oc' into android-msm-marlin-3.18-oc-mr1
39ead04ae input: synaptics: restrict sysfs node write permissions
eb6d0d5a6 ASoC: wcd9xxx: restrict debugfs permission
36f7aa0ea staging: android: ashmem: fix a race condition in ASHMEM_SET_SIZE ioctl
cb8b04b2c arm64/configs: marlin: remove unused configs for Bluetooth
7ddc1b72a msm: mdss: Fix possible memory overwrite in pgc config
b77553369 spcom: avoid race condition when handling commands
e24ac1599 BACKPORT: ANDROID: sched/fair: Select correct capacity state for energy_diff
68cd93c15 UPSTREAM: crypto: algif_skcipher - Load TX SG list after waiting
4a512c24d msm: ADSPRPC: validate user buffers after copying from user
bd6435bfe qcacld-2.0: Buffer overflow in setrmcenable, setrmcactionperiod
159081fea HACK: arm64: add CNTPCT_EL0 trap handler
2550356c6 clocksource: arch_timer: make virtual counter access configurable
2a2e615b9 arm64: issue isb when trapping CNTVCT_EL0 access
364545647 BACKPORT: arm64: Add CNTFRQ_EL0 trap handler
0eed5140c BACKPORT: arm64: Add CNTVCT_EL0 trap handler
daa63ac1c Revert "clocksource: arch_timer: Enable user access to the physical counter"
830600835 Revert "drivers: clocksource: arch_timer: enable user access to virt timers"
c229a9cc4 Merge branch 'android-msm-marlin-3.18-oc-mr1' into android-msm-marlin-3.18-oc-mr1-security-next
15b9c991f Merge branch 'android-msm-marlin-3.18-oc-mr1' into android-msm-marlin-3.18-oc-mr1-security-next
ef8246b99 Merge branch 'android-msm-marlin-3.18' into android-msm-marlin-3.18-security-next
b2fe8f732 Merge branch 'android-msm-marlin-3.18' into android-msm-marlin-3.18-security-next
664f7e854 Merge branch 'android-msm-marlin-3.18' into android-msm-marlin-3.18-security-next
81852ab0c Merge android-msm-marlin-3.18 into android-msm-marlin-3.18-security-next
65dec89b3 Merge android-msm-marlin-3.18 into android-msm-marlin-3.18-security-next
4b6dc75b0 UPSTREAM: char: Drop bogus dependency of DEVPORT on !M68K
6e9db0bcf msm: camera: Fix kernel overwrite GET_BUF_BY_IDX ioctl
a3ddd2b2c qcacld-2.0: Add bounday check for multicastAddr array
3db9ce7b5 msm: rmnet_ipa: fix security issue
81d88a545 msm: isp: fix for potentitial array out of bound access
49ffea115 FROMLIST: msm: qdsp6v2: set pointer to NULL after free
fc479b893 Merge branch msm-google/android-msm-marlin-3.18 into android-msm-marlin-3.18-security-next
d986e63df Merge branch android-msm-marlin-3.18-nyc-mr2 into android-msm-marlin-3.18
95c2a398b UPSTREAM: ipv6 addrconf: implement RFC7559 router solicitation backoff
3c1d525ee ANDROID: checkpatch: special audit for revert commit line
ac5b69538 net: ipv6: Add sysctl for minimum prefix len acceptable in RIOs.
67aae9ba1 UPSTREAM: usb: gadget: f_fs: add "no_disconnect" mode
fcc7f7a1e cnss_prealloc: Remove WARN_ON
391055770 Revert "Revert "input: gpio_keys: Disable task dump on bugreport key combo""
f7ddef061 Revert "qcacld-2.0: Add support for 2.4G Vht Interop"
b8eb5b8d6 Revert "qcacld-2.0: Add support for 2.4G VHT Interop in SAP"
df4086958 Revert "qcacld-2.0: wlan host driver upgrade to 4.4.25.038"
a9d41df16 Revert "qcacld-2.0: Fill bss_description after leaving room for ap.ieData"
2d0d19897 Revert "qcacld-2.0: wlan host driver upgrade to 4.4.25.039"
b9141e9af Revert "Revert "BACKPORT: rcu: sysctl: Panic on RCU Stall""
0a6197c48 arm64/configs: marlin: Enable RNDIS_IPA
89ad88654 marlin: enable /proc/config.gz support in defconfig
42b6a7e4f Revert "sched: freq: Reevaluate throttle if frequency requested changes"
6e3633e76 arm64/configs: use default for CONFIG_ANDROID_BINDER_DEVICES.
6bf94e343 ANDROID: binder: add hwbinder,vndbinder to BINDER_DEVICES.
26e71f831 qcacld-2.0: wlan host driver upgrade to 4.4.25.039
314511a79 qcacld-2.0: Fill bss_description after leaving room for ap.ieData
c5a016e9d qcacld-2.0: wlan host driver upgrade to 4.4.25.038
c29d70fb4 qcacld-2.0: Add support for 2.4G VHT Interop in SAP
2fb9ea5e8 qcacld-2.0: Add support for 2.4G Vht Interop
8dfcb2bb5 Revert "sched/rt: rt cpu selection integration with EAS."
514201728 Revert "sched: rt: Fix broken sync wakeup logic"
f1189e577 BACKPORT: sched/rt: Add a missing rescheduling point
3ab18ce2e Revert "ANDROID: marlin_defconfig: Enable UDF support and savedefconfig"
317d87bc5 tracing: Have preempt(irqs)off trace preempt disabled functions
f672dbfa0 ANDROID: sdcardfs: Fix style issues in macros
f59e3081c ANDROID: sdcardfs: Use seq_puts over seq_printf
63b8b6c2a ANDROID: sdcardfs: Use to kstrout
b2e36700a ANDROID: sdcardfs: Use pr_[...] instead of printk
30a5c8d9e ANDROID: sdcardfs: remove unneeded null check
b3cce5208 ANDROID: sdcardfs: Fix style issues with comments
c6edb72e2 ANDROID: sdcardfs: Fix formatting
a7317773e ANDROID: sdcardfs: correct order of descriptors
c00ad5d08 ANDROID: fix the deadlock in xt_qtaguid when enable DDEBUG
87cc6f6a2 arm64/configs: marlin: enable CONFIG_IP_MULTICAST
ea98829cf xfrm_user: validate XFRM_MSG_NEWAE XFRMA_REPLAY_ESN_VAL replay_window
839f5e61c Merge branch 'android-msm-marlin-3.18-nyc-mr2' into android-msm-marlin-3.18
ea438a7bd build: enable defconfig check
dc4fd17b5 arm64/configs: marlin make savedefconfig
3b4d6f483 binder: allow new refs to zombie nodes if other refs exist
01b9f96fb binder: add more info to failed transaction logs
868f6ee04 binder: make FIFO inheritance a per-context option
86e51203e binder: add log information for binder transaction failures
21c64694c binder: turn on same debug messages as in common kernel
484f2e5f0 binder_alloc: prevent possible OOO mutex acquisition
1915bd9b6 binder: fix false BUG_ON
fec18f137 cpufreq_sched: Fix race in governor exit path
a5a8d4168 binder: avoid using strong references on nodes for internal refs
6d323645b scsi: ufs: export revision info in health sysfs node
5565ae35e binder: make inc/ref user commands atomic with node state
b0129d3be BACKPORT: sched, rt: Convert switched_{from, to}_rt() / prio_changed_rt() to balance callbacks
5c36487c1 BACKPORT: sched,rt: Remove return value from pull_rt_task()
cb9142b5e UPSTREAM: sched: Allow balance callbacks for check_class_changed()
204f7dfcd BACKPORT: sched: Replace post_schedule with a balance callback list
67b6e7056 FROMLIST: ext4: inherit encryption xattr before other xattrs
73f9e46ac UPSTREAM: fscrypto: add authorization check for setting encryption policy
fea231045 Merge branch 'android-msm-marlin-3.18-nyc-mr2' into android-msm-marlin-3.18
65ba464ac qcacld-2.0: wlan host driver upgrade to 4.4.25.037
9e342ed46 qcacld-2.0: Add radio_id change
b5175930b qcacld-2.0: Update correct msg length in oemData_SendMBOemDataReq API
a1f679e82 qcacld-2.0: Dump vdev ll queue stats during hif_pci_suspend
01ccdbfdb qcacld-2.0: Change the log level in limProcessMlmDisassocReqNtf
18deb5364 qcacld-2.0: Print cmd in hostapd_ioctl
908a6171f qcacld-2.0: Remove BTC code to reduce driver size
68eb4e4df qcacld-2.0: Add support to use generic netlink sockets for userspace apps
48edef37e marlin/sailfish: Enable cnss_genl driver compilation
b360165ca Driver to create cld80211 nl family at bootup time
8ba489847 mmc: core: export device health info via sysfs
e26328074 binder: prevent long delays in zombie reaping
9d0ca1305 scsi: ufs: add sysfs node to export health info
d7909e169 ext4 crypto: fix crash when using software encryption
442e9c9fc binder: protect enqueuing of death notifications
ff4a5bc39 ANDROID: sdcardfs: Fix gid issue
475e2fb0f ANDROID: sdcardfs: Use tabs instead of spaces in multiuser.h
69d32c788 ANDROID: sdcardfs: Remove uninformative prints
177071061 ANDROID: sdcardfs: move path_put outside of spinlock
72d3761d8 ANDROID: sdcardfs: Use case insensitive hash function
0f67385d5 ANDROID: sdcardfs: declare MODULE_ALIAS_FS
5697d1ca5 ANDROID: sdcardfs: Get the blocksize from the lower fs
67de1968c ANDROID: sdcardfs: Use d_invalidate instead of drop_recurisve
10137dc5a ANDROID: sdcardfs: Switch to internal case insensitive compare
6635e9228 ANDROID: sdcardfs: Use spin_lock_nested
cdf7353e7 ANDROID: sdcardfs: Replace get/put with d_lock
2884a9cd7 ANDROID: sdcardfs: rate limit warning print
099e37105 ANDROID: sdcardfs: Fix case insensitive lookup
ae2098942 marlin: defconfig: enable CONFIG_MEMORY_STATE_TIME
75a26e267 Implement memory_state_time, used by qcom,cpubw
587667195 Merge branch 'android-msm-marlin-3.18-nyc-mr2' into android-msm-marlin-3.18
7f6fddb31 Merge branch 'android-msm-marlin-3.18-nyc-mr2' into android-msm-marlin-3.18
585a52fd3 ANDROID: binder: add more debug info when allocation fails.
2a94c9a25 qcacld-2.0: Don't send WoW indication twice to FW
cd776a859 binder: read thread sequence number on every iteration when reaping
35eb96979 binder: make active thread sequence counter 64-bit
442ec3e07 uid_sys_stats: change to use rt_mutex
d58402201 rcu: boost: avoid preemption before calling complete()
6e5a43739 usb: typec: fusb302: Report wakeup event
1f0891e43 binder: prevent new refs to zombie nodes
026f8ebbc KASAN: Panic on first invalid write
Linux version 3.18.70-g0de8712 (android-build@abfarm321) (gcc version
4.9.x-google 20140827 (prerelease) (GCC) ) #1 SMP PREEMPT Wed Jan
17 18:39:52 UTC 2018
Bug: 29311147
Bug: 31339528
Bug: 31364827
Bug: 31432001
Bug: 32775496
Bug: 33316285
Bug: 33333670
Bug: 33967002
Bug: 34193533
Bug: 34469211
Bug: 34723223
Bug: 34873000
Bug: 34984780
Bug: 34991231
Bug: 35139833
Bug: 35331000
Bug: 35630852
Bug: 35633782
Bug: 35643557
Bug: 35668243
Bug: 35720340
Bug: 35766959
Bug: 35803310
Bug: 35833695
Bug: 35848445
Bug: 35893040
Bug: 35993630
Bug: 36004503
Bug: 36007653
Bug: 36052864
Bug: 36072376
Bug: 36088202
Bug: 36093037
Bug: 36095019
Bug: 36105810
Bug: 36137719
Bug: 36138424
Bug: 36160015
Bug: 36215937
Bug: 36220321
Bug: 36228467
Bug: 36279469
Bug: 36358874
Bug: 36371104
Bug: 36372758
Bug: 36406078
Bug: 36427717
Bug: 36492583
Bug: 36509658
Bug: 36511858
Bug: 36516194
Bug: 36524239
Bug: 36559739
Bug: 36565222
Bug: 36587884
Bug: 36604779
Bug: 36725786
Bug: 36801389
Bug: 37156343
Bug: 37158168
Bug: 37210310
Bug: 37275839
Bug: 37279737
Bug: 38159576
Bug: 38177011
Bug: 38182308
Bug: 62464339
Bug: 62800865
Bug: 63083046
Bug: 63172865
Bug: 63527053
Bug: 63851638
Bug: 64315347
Bug: 64386293
Bug: 64836865
Bug: 65172622
Bug: 65853158
Bug: 66954097
Bug: 67582682
Bug: 67713083
Bug: 67713087
Bug: 67713103
Bug: 67713104
Bug: 67713113
Bug: 67900971
Bug: 68266545
Bug: 68664502
Bug: 68870904
Bug: 68992395
Bug: 68992421
Bug: 68992424
Bug: 68992426
Bug: 68992429
Bug: 68992432
Bug: 68992434
Bug: 68992438
Bug: 68992439
Bug: 68992442
Bug: 68992451
Bug: 68992453
Bug: 68992455
Bug: 68992471
Bug: 68992473
Bug: 68992479
Bug: 68996141
Bug: 69051382
Bug: 69051731
Bug: 69051940
Bug: 69052055
Bug: 69052348
Bug: 69848268
Bug: 69856074
Bug: 70235107
Bug: 70237686
Bug: 70237692
Bug: 70237704
Bug: 70237706
Bug: 70237715
Bug: 70237719
Bug: 72042274
Change-Id: I8ab9213059c661da12d7057626170138395eebfa
Source-Branch: android-msm-marlin-3.18-oc-mr1
Signed-off-by: Wei Wang <wvw@google.com>
(cherry picked from commit c2306e7eb9d184586f7b91c287576bf084ebff61)
2 files changed
