Commit 213d41ad authored Jul 10, 2019 by Greg Kroah-Hartman

Merge 4.14.133 into android-4.14-q



Changes in 4.14.133
	Bluetooth: Fix faulty expression for minimum encryption key size check
	ASoC : cs4265 : readable register too low
	ASoC: soc-pcm: BE dai needs prepare when pause release after resume
	spi: bitbang: Fix NULL pointer dereference in spi_unregister_master
	drm/mediatek: fix unbind functions
	drm/mediatek: call drm_atomic_helper_shutdown() when unbinding driver
	drm/mediatek: call mtk_dsi_stop() after mtk_drm_crtc_atomic_disable()
	ASoC: max98090: remove 24-bit format support if RJ is 0
	ASoC: sun4i-i2s: Fix sun8i tx channel offset mask
	ASoC: sun4i-i2s: Add offset to RX channel select
	usb: gadget: fusb300_udc: Fix memory leak of fusb300->ep[i]
	usb: gadget: udc: lpc32xx: allocate descriptor with GFP_ATOMIC
	SoC: rt274: Fix internal jack assignment in set_jack callback
	scsi: hpsa: correct ioaccel2 chaining
	platform/x86: mlx-platform: Fix parent device in i2c-mux-reg device registration
	cpuset: restore sanity to cpuset_cpus_allowed_fallback()
	scripts/decode_stacktrace.sh: prefix addr2line with $CROSS_COMPILE
	mm/mlock.c: change count_mm_mlocked_page_nr return type
	module: Fix livepatch/ftrace module text permissions race
	ftrace: Fix NULL pointer dereference in free_ftrace_func_mapper()
	MIPS: netlogic: xlr: Remove erroneous check in nlm_fmn_send()
	drm/i915/dmc: protect against reading random memory
	ptrace: Fix ->ptracer_cred handling for PTRACE_TRACEME
	crypto: user - prevent operating on larval algorithms
	crypto: cryptd - Fix skcipher instance memory leak
	ALSA: seq: fix incorrect order of dest_client/dest_ports arguments
	ALSA: firewire-lib/fireworks: fix miss detection of received MIDI messages
	ALSA: line6: Fix write on zero-sized buffer
	ALSA: usb-audio: fix sign unintended sign extension on left shifts
	ALSA: hda/realtek - Change front mic location for Lenovo M710q
	lib/mpi: Fix karactx leak in mpi_powm
	tracing/snapshot: Resize spare buffer if size changed
	arm64: kaslr: keep modules inside module region when KASAN is enabled
	drm/amdgpu/gfx9: use reset default for PA_SC_FIFO_SIZE
	drm/imx: notify drm core before sending event during crtc disable
	drm/imx: only send event on crtc disable if kept disabled
	ftrace/x86: Remove possible deadlock between register_kprobe() and ftrace_run_update_code()
	mm/vmscan.c: prevent useless kswapd loops
	btrfs: Ensure replaced device doesn't have pending chunk allocation
	vhost-net: set packet weight of tx polling to 2 * vq size
	vhost_net: use packet weight for rx handler, too
	vhost_net: introduce vhost_exceeds_weight()
	vhost: introduce vhost_exceeds_weight()
	vhost_net: fix possible infinite loop
	vhost: vsock: add weight support
	vhost: scsi: add weight support
	tty: rocket: fix incorrect forward declaration of 'rp_init()'
	ARC: handle gcc generated __builtin_trap for older compiler
	KVM: x86: degrade WARN to pr_warn_ratelimited
	KVM: LAPIC: Fix pending interrupt in IRR blocked by software disable LAPIC
	svcrdma: Ignore source port when computing DRC hash
	MIPS: Fix bounds check virt_addr_valid
	MIPS: Add missing EHB in mtc0 -> mfc0 sequence.
	dmaengine: imx-sdma: remove BD_INTR for channel0
	stable/btrfs: fix backport bug in d819d97e ("btrfs: honor path->skip_locking in backref code")
	Linux 4.14.133

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parents 574ebb21 aea8526e

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 14
		SUBLEVEL = 132
		SUBLEVEL = 133
		EXTRAVERSION =
		NAME = Petit Gorille

arch/arc/kernel/traps.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -155,3 +155,11 @@ void do_insterror_or_kprobe(unsigned long address, struct pt_regs *regs)

		insterror_is_error(address, regs);
		}

		/*
		* abort() call generated by older gcc for __builtin_trap()
		*/
		void abort(void)
		{
		__asm__ __volatile__("trap_s 5\n");
		}

arch/arm64/kernel/module.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@

		void *module_alloc(unsigned long size)
		{
		u64 module_alloc_end = module_alloc_base + MODULES_VSIZE;
		gfp_t gfp_mask = GFP_KERNEL;
		void *p;

		@@ -39,9 +40,12 @@ void *module_alloc(unsigned long size)
		if (IS_ENABLED(CONFIG_ARM64_MODULE_PLTS))
		gfp_mask \|= __GFP_NOWARN;

		if (IS_ENABLED(CONFIG_KASAN))
		/* don't exceed the static module region - see below */
		module_alloc_end = MODULES_END;

		p = __vmalloc_node_range(size, MODULE_ALIGN, module_alloc_base,
		module_alloc_base + MODULES_VSIZE,
		gfp_mask, PAGE_KERNEL_EXEC, 0,
		module_alloc_end, gfp_mask, PAGE_KERNEL_EXEC, 0,
		NUMA_NO_NODE, __builtin_return_address(0));

		if (!p && IS_ENABLED(CONFIG_ARM64_MODULE_PLTS) &&

arch/mips/include/asm/netlogic/xlr/fmn.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -301,8 +301,6 @@ static inline int nlm_fmn_send(unsigned int size, unsigned int code,
		for (i = 0; i < 8; i++) {
		nlm_msgsnd(dest);
		status = nlm_read_c2_status0();
		if ((status & 0x2) == 1)
		pr_info("Send pending fail!\n");
		if ((status & 0x4) == 0)
		return 0;
		}

arch/mips/mm/mmap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -203,7 +203,7 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)

		int __virt_addr_valid(const volatile void *kaddr)
		{
		unsigned long vaddr = (unsigned long)vaddr;
		unsigned long vaddr = (unsigned long)kaddr;

		if ((vaddr < PAGE_OFFSET) \|\| (vaddr >= MAP_BASE))
		return 0;