Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8045b506 authored by Runmin Wang's avatar Runmin Wang
Browse files

Merge remote-tracking branch 'remotes/origin/tmp-7b377501' into msm-4.14



* remotes/origin/tmp-7b377501:
  Linux 4.14.8
  usb: musb: da8xx: fix babble condition handling
  ath10k: fix build errors with !CONFIG_PM
  ath10k: fix core PCI suspend when WoWLAN is supported but disabled
  ath9k: fix tx99 potential info leak
  lightnvm: pblk: protect line bitmap while submitting meta io
  lightnvm: pblk: fix min size for page mempool
  lightnvm: pblk: initialize debug stat counter
  lightnvm: pblk: use right flag for GC allocation
  lightnvm: pblk: fix changing GC group list for a line
  lightnvm: pblk: prevent gc kicks when gc is not operational
  icmp: don't fail on fragment reassembly time exceeded
  IB/ipoib: Grab rtnl lock on heavy flush when calling ndo_open/stop
  RDMA/cma: Avoid triggering undefined behavior
  IB/core: Fix endianness annotation in rdma_is_multicast_addr()
  macvlan: Only deliver one copy of the frame to the macvlan interface
  udf: Avoid overflow when session starts at large offset
  xprtrdma: Don't defer fencing an async RPC's chunks
  md-cluster: fix wrong condition check in raid1_write_request
  raid5-ppl: check recovery_offset when performing ppl recovery
  scsi: bfa: integer overflow in debugfs
  scsi: sd: change allow_restart to bool in sysfs interface
  scsi: sd: change manage_start_stop to bool in sysfs interface
  nullb: fix error return code in null_init()
  ipmi_si: fix memory leak on new_smi
  rtl8188eu: Fix a possible sleep-in-atomic bug in rtw_disassoc_cmd
  rtl8188eu: Fix a possible sleep-in-atomic bug in rtw_createbss_cmd
  IB/hfi1: Mask out A bit from psn trace
  vt6655: Fix a possible sleep-in-atomic bug in vt6655_suspend
  IB/core: Fix calculation of maximum RoCE MTU
  IB/core: Fix use workqueue without WQ_MEM_RECLAIM
  scsi: scsi_devinfo: Add REPORTLUN2 to EMC SYMMETRIX blacklist entry
  raid5: Set R5_Expanded on parity devices as well as data.
  pinctrl: adi2: Fix Kconfig build problem
  dev/dax: fix uninitialized variable build warning
  tty fix oops when rmmod 8250
  KVM: nVMX: Fix EPT switching advertising
  ipv4: ipv4_default_advmss() should use route mtu
  soc: mediatek: pwrap: fix compiler errors
  powerpc/xmon: Check before calling xive functions
  powerpc/perf/hv-24x7: Fix incorrect comparison in memord
  serdev: ttyport: enforce tty-driver open() requirement
  net: hns3: fix a bug when alloc new buffer
  net: hns3: fix the bug when map buffer fail
  net: hns3: fix the TX/RX ring.queue_index in hns3_ring_get_cfg
  mfd: mxs-lradc: Fix error handling in mxs_lradc_probe()
  scsi: hpsa: destroy sas transport properties before scsi_host
  scsi: hpsa: cleanup sas_phy structures in sysfs when unloading
  scsi: hisi_sas: fix the risk of freeing slot twice
  PCI: Detach driver before procfs & sysfs teardown on device remove
  RDMA/cxgb4: Declare stag as __be32
  net: hns3: fix the bug of hns3_set_txbd_baseinfo
  net: hns3: add nic_client check when initialize roce base information
  net: hns3: fix a bug in hclge_uninit_client_instance
  net: dsa: lan9303: Do not disable switch fabric port 0 at .probe
  xfs: fix incorrect extent state in xfs_bmap_add_extent_unwritten_real
  xfs: return a distinct error code value for IGET_INCORE cache misses
  xfs: fix log block underflow during recovery cycle verification
  l2tp: cleanup l2tp_tunnel_delete calls
  nvme: use kref_get_unless_zero in nvme_find_get_ns
  platform/x86: hp_accel: Add quirk for HP ProBook 440 G4
  liquidio: fix kernel panic in VF driver
  samples/bpf: adjust rlimit RLIMIT_MEMLOCK for xdp1
  Bluetooth: btusb: Add new NFA344A entry.
  ARM64: dts: meson-gxbb-odroidc2: fix usb1 power supply
  mtd: spi-nor: stm32-quadspi: Fix uninitialized error return code
  qtnfmac: modify full Tx queue error reporting
  btrfs: tests: Fix a memory leak in error handling path in 'run_test()'
  btrfs: avoid null pointer dereference on fs_info when calling btrfs_crit
  btrfs: undo writable superblocke when sprouting fails
  btrfs: Explicitly handle btrfs_update_root failure
  btrfs: fix false EIO for missing device
  arm64: prevent regressions in compressed kernel image size when upgrading to binutils 2.27
  Bluetooth: hci_ldisc: Fix another race when closing the tty.
  Ib/hfi1: Return actual operational VLs in port info query
  bcache: fix wrong cache_misses statistics
  bcache: explicitly destroy mutex while exiting
  rpmsg: glink: Initialize the "intent_req_comp" completion variable
  media: usbtv: fix brightness and contrast controls
  GFS2: Take inode off order_write list when setting jdata flag
  scsi: scsi_debug: write_same: fix error report
  misc: pci_endpoint_test: Avoid triggering a BUG()
  misc: pci_endpoint_test: Fix failure path return values in probe
  thermal/drivers/step_wise: Fix temperature regulation misbehavior
  ASoC: rsnd: rsnd_ssi_run_mods() needs to care ssi_parent_mod
  ppp: Destroy the mutex when cleanup
  clk: tegra: Fix cclk_lp divisor register
  clk: tegra: Use readl_relaxed_poll_timeout_atomic() in tegra210_clock_init()
  blk-mq-sched: dispatch from scheduler IFF progress is made in ->dispatch
  clk: hi6220: mark clock cs_atb_syspll as critical
  media: camss-vfe: always initialize reg at vfe_set_xbar_cfg()
  clk: imx6: refine hdmi_isfr's parent to make HDMI work on i.MX6 SoCs w/o VPU
  clk: imx: imx7d: Fix parent clock for OCRAM_CLK
  clk: mediatek: add the option for determining PLL source clock
  staging: rtl8188eu: Revert part of "staging: rtl8188eu: fix comments with lines over 80 characters"
  net: hns3: Fix a misuse to devm_free_irq
  net: hns3: fix for getting advertised_caps in hns3_get_link_ksettings
  mm: Handle 0 flags in _calc_vm_trans() macro
  crypto: tcrypt - fix buffer lengths in test_aead_speed()
  arm-ccn: perf: Prevent module unload while PMU is in use
  xfs: truncate pagecache before writeback in xfs_setattr_size()
  iommu/amd: Limit the IOVA page range to the specified addresses
  badblocks: fix wrong return value in badblocks_set if badblocks are disabled
  target/file: Do not return error for UNMAP if length is zero
  target:fix condition return in core_pr_dump_initiator_port()
  iscsi-target: fix memory leak in lio_target_tiqn_addtpg()
  target/iscsi: Fix a race condition in iscsit_add_reject_from_cmd()
  target/iscsi: Detect conn_cmd_list corruption early
  platform/x86: intel_punit_ipc: Fix resource ioremap warning
  powerpc/pseries/vio: Dispose of virq mapping on vdevice unregister
  powerpc/ipic: Fix status get and status clear
  powerpc/opal: Fix EBUSY bug in acquiring tokens
  netfilter: ipvs: Fix inappropriate output of procfs
  thunderbolt: tb: fix use after free in tb_activate_pcie_devices
  iommu/mediatek: Fix driver name
  PCI: Do not allocate more buses than available in parent
  powerpc/powernv/cpufreq: Fix the frequency read by /proc/cpuinfo
  PCI/PME: Handle invalid data when reading Root Status
  mlxsw: spectrum: Fix error return code in mlxsw_sp_port_create()
  dmaengine: ti-dma-crossbar: Correct am335x/am43xx mux value type
  ASoC: Intel: Skylake: Fix uuid_module memory leak in failure case
  PM / s2idle: Clear the events_check_enabled flag
  drm/amdgpu: bypass lru touch for KIQ ring submission
  scsi: aacraid: use timespec64 instead of timeval
  rtc: pcf8563: fix output clock rate
  video: fbdev: au1200fb: Return an error code if a memory allocation fails
  video: fbdev: au1200fb: Release some resources if a memory allocation fails
  video: udlfb: Fix read EDID timeout
  fbdev: controlfb: Add missing modes to fix out of bounds access
  sfc: don't warn on successful change of MAC
  HID: cp2112: fix broken gpio_direction_input callback
  IB/mlx4: Fix RSS's QPC attributes assignments
  ext4: fix crash when a directory's i_size is too small
  ext4: add missing error check in __ext4_new_inode()
  ext4: fix fdatasync(2) after fallocate(2) operation
  ext4: support fast symlinks from ext3 file systems
  Revert "exec: avoid RLIMIT_STACK races with prlimit()"
  dmaengine: dmatest: move callback wait queue to thread context
  posix-timer: Properly check sigevent->sigev_notify
  eeprom: at24: change nvmem stride to 1
  x86/boot/compressed/64: Print error if 5-level paging is not supported
  x86/boot/compressed/64: Detect and handle 5-level paging at boot-time
  iw_cxgb4: only insert drain cqes if wq is flushed
  SUNRPC: Fix a race in the receive code path
  dm: fix various targets to dm_register_target after module __init resources created
  sched/rt: Do not pull from current CPU if only one CPU to pull
  scsi: libsas: fix length error in sas_smp_handler()
  scsi: core: Fix a scsi_show_rq() NULL pointer dereference
  arm64: fix CONFIG_DEBUG_WX address reporting
  arm64: Initialise high_memory global variable earlier
  arm64: mm: Fix pte_mkclean, pte_mkdirty semantics
  nfs: don't wait on commit in nfs_commit_inode() if there were no commit requests
  IB/core: Don't enforce PKey security on SMI MADs
  IB/core: Bound check alternate path port number
  xhci: Don't add a virt_dev to the devs array before it's fully allocated
  usb: xhci: fix TDS for MTK xHCI1.1
  ceph: drop negative child dentries before try pruning inode's alias
  mmc: core: apply NO_CMD23 quirk to some specific cards
  usbip: fix stub_send_ret_submit() vulnerability to null transfer_buffer
  usbip: prevent vhci_hcd driver from leaking a socket pointer address
  usbip: fix stub_rx: harden CMD_SUBMIT path to handle malicious input
  usbip: fix stub_rx: get_pipe() to validate endpoint number
  ovl: update ctx->pos on impure dir iteration
  ovl: Pass ovl_get_nlink() parameters in right order
  USB: core: prevent malicious bNumInterfaces overflow
  USB: uas and storage: Add US_FL_BROKEN_FUA for another JMicron JMS567 ID
  tracing: Allocate mask_str buffer dynamically
  mm, oom_reaper: fix memory corruption
  kernel: make groups_sort calling a responsibility group_info allocators
  autofs: fix careless error in recent commit
  string.h: workaround for increased stack usage
  cifs: fix NULL deref in SMB2_read
  crypto: af_alg - fix NULL pointer dereference in
  crypto: salsa20 - fix blkcipher_walk API usage
  crypto: hmac - require that the underlying hash algorithm is unkeyed
  crypto: rsa - fix buffer overread when stripping leading zeroes
  crypto: algif_aead - fix reference counting of null skcipher
  mfd: fsl-imx25: Clean up irq settings during removal

Change-Id: I85518720609ec3e039cdf104fc1a54dd022a3577
Signed-off-by: default avatarRunmin Wang <runminw@codeaurora.org>
parents b716d1c6 7b377501
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 14
SUBLEVEL = 7
SUBLEVEL = 8
EXTRAVERSION =
NAME = Petit Gorille

+6 −2
Original line number Diff line number Diff line
@@ -14,8 +14,12 @@ LDFLAGS_vmlinux :=-p --no-undefined -X
CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)
GZFLAGS		:=-9

ifneq ($(CONFIG_RELOCATABLE),)
LDFLAGS_vmlinux		+= -pie -shared -Bsymbolic
ifeq ($(CONFIG_RELOCATABLE), y)
# Pass --no-apply-dynamic-relocs to restore pre-binutils-2.27 behaviour
# for relative relocs, since this leads to better Image compression
# with the relocation offsets always being zero.
LDFLAGS_vmlinux		+= -pie -shared -Bsymbolic \
			$(call ld-option, --no-apply-dynamic-relocs)
endif

ifeq ($(CONFIG_ARM64_ERRATUM_843419),y)
+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@

&usb1_phy {
	status = "okay";
	phy-supply = <&usb_otg_pwr>;
};

&usb0 {
+18 −15
Original line number Diff line number Diff line
@@ -150,12 +150,20 @@ static inline pte_t pte_mkwrite(pte_t pte)

static inline pte_t pte_mkclean(pte_t pte)
{
	return clear_pte_bit(pte, __pgprot(PTE_DIRTY));
	pte = clear_pte_bit(pte, __pgprot(PTE_DIRTY));
	pte = set_pte_bit(pte, __pgprot(PTE_RDONLY));

	return pte;
}

static inline pte_t pte_mkdirty(pte_t pte)
{
	return set_pte_bit(pte, __pgprot(PTE_DIRTY));
	pte = set_pte_bit(pte, __pgprot(PTE_DIRTY));

	if (pte_write(pte))
		pte = clear_pte_bit(pte, __pgprot(PTE_RDONLY));

	return pte;
}

static inline pte_t pte_mkold(pte_t pte)
@@ -671,28 +679,23 @@ static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */

/*
 * ptep_set_wrprotect - mark read-only while preserving the hardware update of
 * the Access Flag.
 * ptep_set_wrprotect - mark read-only while trasferring potential hardware
 * dirty status (PTE_DBM && !PTE_RDONLY) to the software PTE_DIRTY bit.
 */
#define __HAVE_ARCH_PTEP_SET_WRPROTECT
static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long address, pte_t *ptep)
{
	pte_t old_pte, pte;

	/*
	 * ptep_set_wrprotect() is only called on CoW mappings which are
	 * private (!VM_SHARED) with the pte either read-only (!PTE_WRITE &&
	 * PTE_RDONLY) or writable and software-dirty (PTE_WRITE &&
	 * !PTE_RDONLY && PTE_DIRTY); see is_cow_mapping() and
	 * protection_map[]. There is no race with the hardware update of the
	 * dirty state: clearing of PTE_RDONLY when PTE_WRITE (a.k.a. PTE_DBM)
	 * is set.
	 */
	VM_WARN_ONCE(pte_write(*ptep) && !pte_dirty(*ptep),
		     "%s: potential race with hardware DBM", __func__);
	pte = READ_ONCE(*ptep);
	do {
		old_pte = pte;
		/*
		 * If hardware-dirty (PTE_WRITE/DBM bit set and PTE_RDONLY
		 * clear), set the PTE_DIRTY bit.
		 */
		if (pte_hw_dirty(pte))
			pte = pte_mkdirty(pte);
		pte = pte_wrprotect(pte);
		pte_val(pte) = cmpxchg_relaxed(&pte_val(*ptep),
					       pte_val(old_pte), pte_val(pte));
+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ void ptdump_check_wx(void)
		.check_wx = true,
	};

	walk_pgd(&st, &init_mm, 0);
	walk_pgd(&st, &init_mm, VA_START);
	note_page(&st, 0, 0, 0);
	if (st.wx_pages || st.uxn_pages)
		pr_warn("Checked W+X mappings: FAILED, %lu W+X pages found, %lu non-UXN pages found\n",
Loading