+1
−1
Loading
Merge android-4.14-p.86 (8629d9bd) into msm-4.14
* refs/heads/tmp-8629d9bd: Linux 4.14.86 f2fs: fix missing up_read libceph: check authorizer reply/challenge length before reading libceph: weaken sizeof check in ceph_x_verify_authorizer_reply() binder: fix race that allows malicious free of live buffer misc: mic/scif: fix copy-paste error in scif_create_remote_lookup Drivers: hv: vmbus: check the creation_status in vmbus_establish_gpadl() mm: use swp_offset as key in shmem_replace_page() lib/test_kmod.c: fix rmmod double free iio:st_magn: Fix enable device after trigger Revert "usb: dwc3: gadget: skip Set/Clear Halt when invalid" usb: core: quirks: add RESET_RESUME quirk for Cherry G230 Stream series USB: usb-storage: Add new IDs to ums-realtek staging: rtl8723bs: Add missing return for cfg80211_rtw_get_station staging: vchiq_arm: fix compat VCHIQ_IOC_AWAIT_COMPLETION btrfs: release metadata before running delayed refs dmaengine: at_hdmac: fix module unloading dmaengine: at_hdmac: fix memory leak in at_dma_xlate() ARM: dts: rockchip: Remove @0 from the veyron memory node ext2: fix potential use after free ALSA: hda/realtek - fix headset mic detection for MSI MS-B171 ALSA: hda/realtek - Support ALC300 ALSA: sparc: Fix invalid snd_free_pages() at error path ALSA: control: Fix race between adding and removing a user element ALSA: ac97: Fix incorrect bit shift at AC97-SPSA control write ALSA: wss: Fix invalid snd_free_pages() at error path fs: fix lost error code in dio_complete perf/x86/intel: Add generic branch tracing check to intel_pmu_has_bts() perf/x86/intel: Move branch tracing setup to the Intel-specific source file x86/fpu: Disable bottom halves while loading FPU registers x86/MCE/AMD: Fix the thresholding machinery initialization order arm64: dts: rockchip: Fix PCIe reset polarity for rk3399-puma-haikou. PCI: layerscape: Fix wrong invocation of outbound window disable accessor btrfs: relocation: set trans to be NULL after ending transaction Btrfs: ensure path name is null terminated at btrfs_control_ioctl xtensa: fix coprocessor part of ptrace_{get,set}xregs xtensa: fix coprocessor context offset definitions xtensa: enable coprocessors that are being flushed KVM: X86: Fix scan ioapic use-before-initialization KVM: x86: Fix kernel info-leak in KVM_HC_CLOCK_PAIRING hypercall kvm: svm: Ensure an IBPB on all affected CPUs when freeing a vmcb kvm: mmu: Fix race in emulated page table writes x86/speculation: Provide IBPB always command line options x86/speculation: Add seccomp Spectre v2 user space protection mode x86/speculation: Enable prctl mode for spectre_v2_user x86/speculation: Add prctl() control for indirect branch speculation x86/speculation: Prepare arch_smt_update() for PRCTL mode x86/speculation: Prevent stale SPEC_CTRL msr content x86/speculation: Split out TIF update ptrace: Remove unused ptrace_may_access_sched() and MODE_IBRS x86/speculation: Prepare for conditional IBPB in switch_mm() x86/speculation: Avoid __switch_to_xtra() calls x86/process: Consolidate and simplify switch_to_xtra() code x86/speculation: Prepare for per task indirect branch speculation control x86/speculation: Add command line control for indirect branch speculation x86/speculation: Unify conditional spectre v2 print functions x86/speculataion: Mark command line parser data __initdata x86/speculation: Mark string arrays const correctly x86/speculation: Reorder the spec_v2 code x86/l1tf: Show actual SMT state x86/speculation: Rework SMT state change sched/smt: Expose sched_smt_present static key x86/Kconfig: Select SCHED_SMT if SMP enabled sched/smt: Make sched_smt_present track topology x86/speculation: Reorganize speculation control MSRs update x86/speculation: Rename SSBD update functions x86/speculation: Disable STIBP when enhanced IBRS is in use x86/speculation: Move STIPB/IBPB string conditionals out of cpu_show_common() x86/speculation: Remove unnecessary ret variable in cpu_show_common() x86/speculation: Clean up spectre_v2_parse_cmdline() x86/speculation: Update the TIF_SSBD comment x86/retpoline: Remove minimal retpoline support x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support x86/speculation: Add RETPOLINE_AMD support to the inline asm CALL_NOSPEC variant x86/speculation: Propagate information about RSB filling mitigation to sysfs x86/speculation: Apply IBPB more strictly to avoid cross-process data leak x86/speculation: Enable cross-hyperthread spectre v2 STIBP mitigation x86/bugs: Fix the AMD SSBD usage of the SPEC_CTRL MSR x86/bugs: Update when to check for the LS_CFG SSBD mitigation x86/bugs: Switch the selection of mitigation from CPU vendor to CPU features x86/bugs: Add AMD's SPEC_CTRL MSR usage x86/bugs: Add AMD's variant of SSB_NO sched/core: Fix cpu.max vs. cpuhotplug deadlock usbnet: ipheth: fix potential recvmsg bug and recvmsg bug 2 s390/qeth: fix length check in SNMP processing rapidio/rionet: do not free skb before reading its length packet: copy user buffers before orphan or clone net: thunderx: set tso_hdrs pointer to NULL in nicvf_free_snd_queue virtio-net: fail XDP set if guest csum is negotiated virtio-net: disable guest csum during XDP set net: thunderx: set xdp_prog to NULL if bpf_prog_add fails net: skb_scrub_packet(): Scrub offload_fwd_mark Revert "wlcore: Add missing PM call for wlcore_cmd_wait_for_event_or_timeout()" xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE f2fs: fix to do sanity check with cp_pack_start_sum f2fs: fix to do sanity check with i_extra_isize f2fs: fix to do sanity check with block address in main area f2fs: fix to do sanity check with node footer and iblocks f2fs: fix to do sanity check with user_block_count f2fs: fix to do sanity check with extra_attr feature f2fs: Add sanity_check_inode() function f2fs: fix to do sanity check with secs_per_zone f2fs: introduce and spread verify_blkaddr f2fs: clean up with is_valid_blkaddr() f2fs: enhance sanity_check_raw_super() to avoid potential overflow f2fs: sanity check on sit entry f2fs: check blkaddr more accuratly before issue a bio btrfs: tree-checker: Fix misleading group system information btrfs: tree-checker: Check level for leaves and nodes btrfs: Check that each block group has corresponding chunk at mount time btrfs: tree-checker: Detect invalid and empty essential trees btrfs: tree-checker: Verify block_group_item btrfs: tree-check: reduce stack consumption in check_dir_item btrfs: tree-checker: use %zu format string for size_t btrfs: tree-checker: Add checker for dir item btrfs: tree-checker: Fix false panic for sanity test btrfs: tree-checker: Enhance btrfs_check_node output btrfs: Move leaf and node validation checker to tree-checker.c btrfs: Add checker for EXTENT_CSUM btrfs: Add sanity check for EXTENT_DATA when reading out leaf btrfs: Check if item pointer overlaps with the item itself btrfs: Refactor check_leaf function for later expansion btrfs: Verify that every chunk has corresponding block group at mount time btrfs: validate type when reading a chunk wil6210: missing length check in wmi_set_ie net/tls: Fixed return value when tls_complete_pending_work() fails tls: Use correct sk->sk_prot for IPV6 tls: don't override sk_write_space if tls_set_sw_offload fails. tls: Avoid copying crypto_info again after cipher_type check. tls: Fix TLS ulp context leak, when TLS_TX setsockopt is not used. tls: Add function to update the TLS socket configuration bpf: Prevent memory disambiguation attack libceph: implement CEPHX_V2 calculation mode libceph: add authorizer challenge libceph: factor out encrypt_authorizer() libceph: factor out __ceph_x_decrypt() libceph: factor out __prepare_write_connect() libceph: store ceph_auth_handshake pointer in ceph_connection ubi: Initialize Fastmap checkmapping correctly media: em28xx: Fix use-after-free when disconnecting mm/khugepaged: collapse_shmem() do not crash on Compound mm/khugepaged: collapse_shmem() without freezing new_page mm/khugepaged: minor reorderings in collapse_shmem() mm/khugepaged: collapse_shmem() remember to clear holes mm/khugepaged: fix crashes due to misaccounted holes mm/khugepaged: collapse_shmem() stop if punched or truncated mm/huge_memory: fix lockdep complaint on 32-bit i_size_read() mm/huge_memory: splitting set mapping+index before unfreeze mm/huge_memory.c: reorder operations in __split_huge_page_tail() mm/huge_memory: rename freeze_page() to unmap_page() Conflicts: drivers/net/wireless/ath/wil6210/wmi.c fs/f2fs/segment.c include/linux/sched.h Extra change is added into this merge in file [1]: f2fs: Restore discarded delta from commit a7848c0d a7848c0d f2fs: support flexible inline xattr size Code is removed during conflict resolution on merging LTS tag v4.14.86 into android-4.14-p. Without this delta file system corruption issues are observed and the system fails to boot up completely. [1] fs/f2fs/inode.c Change-Id: Icd2a2b2bf4e7be75795d6aede864dd9aa4e64bfa Signed-off-by:Blagovest Kolenichev <bkolenichev@codeaurora.org> Signed-off-by: