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

Commit 3c38b3e5 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14-p.69 (c535ee76) into msm-4.14 



* refs/heads/tmp-c535ee76:
  Linux 4.14.69
  arm64: mm: always enable CONFIG_HOLES_IN_ZONE
  fs/quota: Fix spectre gadget in do_quotactl
  crypto: caam/qi - fix error path in xts setkey
  crypto: caam/jr - fix descriptor DMA unmapping
  crypto: caam - fix DMA mapping direction for RSA forms 2 & 3
  crypto: vmx - Fix sleep-in-atomic bugs
  perf auxtrace: Fix queue resize
  cap_inode_getsecurity: use d_find_any_alias() instead of d_find_alias()
  bcache: release dc->writeback_lock properly in bch_writeback_thread()
  libnvdimm: fix ars_status output length calculation
  getxattr: use correct xattr length
  udlfb: set optimal write delay
  fb: fix lost console when the user unplugs a USB adapter
  pwm: tiehrpwm: Fix disabling of output of PWMs
  pwm: tiehrpwm: Don't use emulation mode bits to control PWM output
  ubifs: Fix synced_i_size calculation for xattr inodes
  ubifs: xattr: Don't operate on deleted inodes
  ubifs: Check data node size before truncate
  Revert "UBIFS: Fix potential integer overflow in allocation"
  ubifs: Fix memory leak in lprobs self-check
  userns: move user access out of the mutex
  sys: don't hold uts_sem while accessing userspace memory
  iommu/vt-d: Fix dev iotlb pfsid use
  iommu/vt-d: Add definitions for PFSID
  mm/tlb: Remove tlb_remove_table() non-concurrent condition
  ARM: tegra: Fix Tegra30 Cardhu PCA954x reset
  NFSv4: Fix a sleep in atomic context in nfs4_callback_sequence()
  NFSv4: Fix locking in pnfs_generic_recover_commit_reqs
  NFSv4 client live hangs after live data migration recovery
  pnfs/blocklayout: off by one in bl_map_stripe()
  block, bfq: return nbytes and not zero from struct cftype .write() method
  xtensa: increase ranges in ___invalidate_{i,d}cache_all
  xtensa: limit offsets in __loop_cache_{all,page}
  KVM: PPC: Book3S: Fix guest DMA when guest partially backed by THP pages
  KVM: VMX: fixes for vmentry_l1d_flush module parameter
  PM / sleep: wakeup: Fix build error caused by missing SRCU support
  cpufreq: governor: Avoid accessing invalid governor_data
  drivers/block/zram/zram_drv.c: fix bug storing backing_dev
  ovl: fix wrong use of impure dir cache in ovl_iterate()
  mfd: hi655x: Fix regmap area declared size for hi655x
  uprobes: Use synchronize_rcu() not synchronize_sched()
  livepatch: Validate module/old func name length
  printk/tracing: Do not trace printk_nmi_enter()
  tracing/blktrace: Fix to allow setting same value
  tracing: Do not call start/stop() functions when tracing_on does not change
  rtc: omap: fix potential crash on power off
  vmw_balloon: fix VMCI use when balloon built into kernel
  vmw_balloon: VMCI_DOORBELL_SET does not check status
  vmw_balloon: do not use 2MB without batching
  vmw_balloon: fix inflation of 64-bit GFNs
  extcon: Release locking when sending the notification of connector state
  iio: ad9523: Fix return value for ad952x_store()
  iio: ad9523: Fix displayed phase
  iio: sca3000: Fix missing return in switch
  Drivers: hv: vmbus: Reset the channel callback in vmbus_onoffer_rescind()
  uart: fix race between uart_put_char() and uart_shutdown()
  dm crypt: don't decrease device limits
  dm cache metadata: set dirty on all cache blocks after a crash
  dm cache metadata: save in-core policy_hint_size to on-disk superblock
  dm thin: stop no_space_timeout worker when switching to write-mode
  dm integrity: change 'suspending' variable from bool to int
  net/9p/trans_fd.c: fix race-condition by flushing workqueue before the kfree()
  net/9p/client.c: version pointer uninitialized
  9p/virtio: fix off-by-one error in sg list bounds check
  fs/9p/xattr.c: catch the error of p9_client_clunk when setting xattr failed
  9p: fix multiple NULL-pointer-dereferences
  RDMA/rxe: Set wqe->status correctly if an unexpected response is received
  ib_srpt: Fix a use-after-free in srpt_close_ch()
  cxl: Fix wrong comparison in cxl_adapter_context_get()
  powerpc/powernv/pci: Work around races in PCI bridge enabling
  PCI: Add wrappers for dev_printk()
  powerpc/pseries: Fix endianness while restoring of r3 in MCE handler.
  powerpc/fadump: handle crash memory ranges array index overflow
  Fix kexec forbidding kernels signed with keys in the secondary keyring to boot
  Replace magic for trusting the secondary keyring with #define
  mailbox: xgene-slimpro: Fix potential NULL pointer dereference
  media: Revert "[media] tvp5150: fix pad format frame height"
  libertas: fix suspend and resume for SDIO connected cards
  drm/i915/userptr: reject zero user_size
  block: really disable runtime-pm for blk-mq
  block: blk_init_allocated_queue() set q->fq as NULL in the fail case
  readahead: stricter check for bdi io_pages
  mmc: renesas_sdhi_internal_dmac: fix #define RST_RESERVED_BITS
  spi: cadence: Change usleep_range() to udelay(), for atomic context
  spi: spi-fsl-dspi: Fix imprecise abort on VF500 during probe
  spi: pxa2xx: Add support for Intel Ice Lake
  spi: davinci: fix a NULL pointer dereference
  9p/net: Fix zero-copy path in the 9p virtio transport
  net: mac802154: tx: expand tailroom if necessary
  net: 6lowpan: fix reserved space for single frames
  ANDROID: squashfs: resolve merge conflict with 4.14.68

Change-Id: I547b8351069d9529aa81d673f0a20e666618a74c
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 47b6f627 c535ee76

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 68

SUBLEVEL = 69

EXTRAVERSION =

NAME = Petit Gorille

arch/alpha/kernel/osf_sys.c

+24 −27
Original line number Diff line number Diff line
@@ -530,24 +530,19 @@ SYSCALL_DEFINE4(osf_mount, unsigned long, typenr, const char __user *, path, 
SYSCALL_DEFINE1(osf_utsname, char __user *, name)

{

	int error;

	char tmp[5 * 32];



	down_read(&uts_sem);

	error = -EFAULT;

	if (copy_to_user(name + 0, utsname()->sysname, 32))

		goto out;

	if (copy_to_user(name + 32, utsname()->nodename, 32))

		goto out;

	if (copy_to_user(name + 64, utsname()->release, 32))

		goto out;

	if (copy_to_user(name + 96, utsname()->version, 32))

		goto out;

	if (copy_to_user(name + 128, utsname()->machine, 32))

		goto out;



	error = 0;

 out:

	memcpy(tmp + 0 * 32, utsname()->sysname, 32);

	memcpy(tmp + 1 * 32, utsname()->nodename, 32);

	memcpy(tmp + 2 * 32, utsname()->release, 32);

	memcpy(tmp + 3 * 32, utsname()->version, 32);

	memcpy(tmp + 4 * 32, utsname()->machine, 32);

	up_read(&uts_sem);

	return error;



	if (copy_to_user(name, tmp, sizeof(tmp)))

		return -EFAULT;

	return 0;

}



SYSCALL_DEFINE0(getpagesize)
@@ -567,18 +562,21 @@ SYSCALL_DEFINE2(osf_getdomainname, char __user *, name, int, namelen) 
{

	int len, err = 0;

	char *kname;

	char tmp[32];



	if (namelen > 32)

	if (namelen < 0 || namelen > 32)

		namelen = 32;



	down_read(&uts_sem);

	kname = utsname()->domainname;

	len = strnlen(kname, namelen);

	if (copy_to_user(name, kname, min(len + 1, namelen)))

		err = -EFAULT;

	len = min(len + 1, namelen);

	memcpy(tmp, kname, len);

	up_read(&uts_sem);



	return err;

	if (copy_to_user(name, tmp, len))

		return -EFAULT;

	return 0;

}



/*
@@ -739,13 +737,14 @@ SYSCALL_DEFINE3(osf_sysinfo, int, command, char __user *, buf, long, count) 
	};

	unsigned long offset;

	const char *res;

	long len, err = -EINVAL;

	long len;

	char tmp[__NEW_UTS_LEN + 1];



	offset = command-1;

	if (offset >= ARRAY_SIZE(sysinfo_table)) {

		/* Digital UNIX has a few unpublished interfaces here */

		printk("sysinfo(%d)", command);

		goto out;

		return -EINVAL;

	}



	down_read(&uts_sem);
@@ -753,13 +752,11 @@ SYSCALL_DEFINE3(osf_sysinfo, int, command, char __user *, buf, long, count) 
	len = strlen(res)+1;

	if ((unsigned long)len > (unsigned long)count)

		len = count;

	if (copy_to_user(buf, res, len))

		err = -EFAULT;

	else

		err = 0;

	memcpy(tmp, res, len);

	up_read(&uts_sem);

 out:

	return err;

	if (copy_to_user(buf, tmp, len))

		return -EFAULT;

	return 0;

}



SYSCALL_DEFINE5(osf_getsysinfo, unsigned long, op, void __user *, buffer,

arch/arm/boot/dts/tegra30-cardhu.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x70>;

			reset-gpio = <&gpio TEGRA_GPIO(BB, 0) GPIO_ACTIVE_LOW>;

		};

	};

arch/arm64/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -742,7 +742,6 @@ config NEED_PER_CPU_EMBED_FIRST_CHUNK 


config HOLES_IN_ZONE

	def_bool y

	depends on NUMA



source kernel/Kconfig.preempt

source kernel/Kconfig.hz

arch/powerpc/include/asm/fadump.h

+0 −3
Original line number Diff line number Diff line
@@ -195,9 +195,6 @@ struct fadump_crash_info_header { 
	struct cpumask	online_mask;

};



/* Crash memory ranges */

#define INIT_CRASHMEM_RANGES	(INIT_MEMBLOCK_REGIONS + 2)



struct fad_crash_memory_ranges {

	unsigned long long	base;

	unsigned long long	size;