Commit fde41616 authored Apr 20, 2019 by Greg Kroah-Hartman

Merge 4.14.113 into android-4.14



Changes in 4.14.113
	ARC: u-boot args: check that magic number is correct
	arc: hsdk_defconfig: Enable CONFIG_BLK_DEV_RAM
	perf/core: Restore mmap record type correctly
	ext4: add missing brelse() in add_new_gdb_meta_bg()
	ext4: report real fs size after failed resize
	ALSA: echoaudio: add a check for ioremap_nocache
	ALSA: sb8: add a check for request_region
	auxdisplay: hd44780: Fix memory leak on ->remove()
	IB/mlx4: Fix race condition between catas error reset and aliasguid flows
	mmc: davinci: remove extraneous __init annotation
	ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and declaration
	thermal/intel_powerclamp: fix __percpu declaration of worker_data
	thermal: bcm2835: Fix crash in bcm2835_thermal_debugfs
	thermal/int340x_thermal: Add additional UUIDs
	thermal/int340x_thermal: fix mode setting
	thermal/intel_powerclamp: fix truncated kthread name
	scsi: iscsi: flush running unbind operations when removing a session
	x86/mm: Don't leak kernel addresses
	tools/power turbostat: return the exit status of a command
	perf list: Don't forget to drop the reference to the allocated thread_map
	perf config: Fix an error in the config template documentation
	perf config: Fix a memory leak in collect_config()
	perf build-id: Fix memory leak in print_sdt_events()
	perf top: Fix error handling in cmd_top()
	perf hist: Add missing map__put() in error case
	perf evsel: Free evsel->counts in perf_evsel__exit()
	perf tests: Fix a memory leak of cpu_map object in the openat_syscall_event_on_all_cpus test
	perf tests: Fix memory leak by expr__find_other() in test__expr()
	perf tests: Fix a memory leak in test__perf_evsel__tp_sched_test()
	irqchip/mbigen: Don't clear eventid when freeing an MSI
	x86/hpet: Prevent potential NULL pointer dereference
	x86/cpu/cyrix: Use correct macros for Cyrix calls on Geode processors
	drm/nouveau/debugfs: Fix check of pm_runtime_get_sync failure
	iommu/vt-d: Check capability before disabling protected memory
	x86/hw_breakpoints: Make default case in hw_breakpoint_arch_parse() return an error
	fix incorrect error code mapping for OBJECTID_NOT_FOUND
	ext4: prohibit fstrim in norecovery mode
	gpio: pxa: handle corner case of unprobed device
	rsi: improve kernel thread handling to fix kernel panic
	9p: do not trust pdu content for stat item size
	9p locks: add mount option for lock retry interval
	f2fs: fix to do sanity check with current segment number
	netfilter: xt_cgroup: shrink size of v2 path
	serial: uartps: console_setup() can't be placed to init section
	powerpc/pseries: Remove prrn_work workqueue
	media: au0828: cannot kfree dev before usb disconnect
	HID: i2c-hid: override HID descriptors for certain devices
	ARM: samsung: Limit SAMSUNG_PM_CHECK config option to non-Exynos platforms
	usbip: fix vhci_hcd controller counting
	ACPI / SBS: Fix GPE storm on recent MacBookPro's
	KVM: nVMX: restore host state in nested_vmx_vmexit for VMFail
	compiler.h: update definition of unreachable()
	cifs: fallback to older infolevels on findfirst queryinfo retry
	kernel: hung_task.c: disable on suspend
	crypto: sha256/arm - fix crash bug in Thumb2 build
	crypto: sha512/arm - fix crash bug in Thumb2 build
	iommu/dmar: Fix buffer overflow during PCI bus notification
	soc/tegra: pmc: Drop locking from tegra_powergate_is_powered()
	lkdtm: Print real addresses
	lkdtm: Add tests for NULL pointer dereference
	drm/panel: panel-innolux: set display off in innolux_panel_unprepare
	crypto: axis - fix for recursive locking from bottom half
	Revert "ACPI / EC: Remove old CLEAR_ON_RESUME quirk"
	coresight: cpu-debug: Support for CA73 CPUs
	drm/nouveau/volt/gf117: fix speedo readout register
	ARM: 8839/1: kprobe: make patch_lock a raw_spinlock_t
	drm/amdkfd: use init_mqd function to allocate object for hid_mqd (CI)
	appletalk: Fix use-after-free in atalk_proc_exit
	lib/div64.c: off by one in shift
	include/linux/swap.h: use offsetof() instead of custom __swapoffset macro
	bpf: fix use after free in bpf_evict_inode
	dm: disable CRYPTO_TFM_REQ_MAY_SLEEP to fix a GFP_KERNEL recursion deadlock
	bpf: reduce verifier memory consumption
	bpf: fix verifier memory leaks
	bpf: fix verifier NULL pointer dereference
	bpf: fix stack state printing in verifier log
	bpf: move {prev_,}insn_idx into verifier env
	bpf: move tmp variable into ax register in interpreter
	bpf: enable access to ax register also from verifier rewrite
	bpf: restrict map value pointer arithmetic for unprivileged
	bpf: restrict stack pointer arithmetic for unprivileged
	bpf: restrict unknown scalars of mixed signed bounds for unprivileged
	bpf: fix check_map_access smin_value test when pointer contains offset
	bpf: prevent out of bounds speculation on pointer arithmetic
	bpf: fix sanitation of alu op with pointer / scalar type from different paths
	bpf: fix inner map masking to prevent oob under speculation
	bpf: do not restore dst_reg when cur_state is freed
	bpf: fix sanitation rewrite in case of non-pointers
	bpf: Fix selftests are changes for CVE 2019-7308
	net: stmmac: Set dma ring length before enabling the DMA
	mm: hide incomplete nr_indirectly_reclaimable in sysfs
	appletalk: Fix compile regression
	Linux 4.14.113

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

parents 4353393c 68d7a45e

Makefile

+1 −1

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

arch/arc/configs/hsdk_defconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -9,6 +9,7 @@ CONFIG_NAMESPACES=y
	# CONFIG_UTS_NS is not set		# CONFIG_UTS_NS is not set
	# CONFIG_PID_NS is not set		# CONFIG_PID_NS is not set
	CONFIG_BLK_DEV_INITRD=y		CONFIG_BLK_DEV_INITRD=y
			CONFIG_BLK_DEV_RAM=y
	CONFIG_EMBEDDED=y		CONFIG_EMBEDDED=y
	CONFIG_PERF_EVENTS=y		CONFIG_PERF_EVENTS=y
	# CONFIG_VM_EVENT_COUNTERS is not set		# CONFIG_VM_EVENT_COUNTERS is not set

arch/arc/kernel/head.S

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -107,6 +107,7 @@ ENTRY(stext)
	; r2 = pointer to uboot provided cmdline or external DTB in mem		; r2 = pointer to uboot provided cmdline or external DTB in mem
	; These are handled later in handle_uboot_args()		; These are handled later in handle_uboot_args()
	st r0, [@uboot_tag]		st r0, [@uboot_tag]
			st r1, [@uboot_magic]
	st r2, [@uboot_arg]		st r2, [@uboot_arg]
	#endif		#endif

arch/arc/kernel/setup.c

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -35,6 +35,7 @@ unsigned int intr_to_DE_cnt;

	/* Part of U-boot ABI: see head.S */		/* Part of U-boot ABI: see head.S */
	int __initdata uboot_tag;		int __initdata uboot_tag;
			int __initdata uboot_magic;
	char __initdata *uboot_arg;		char __initdata *uboot_arg;

	const struct machine_desc *machine_desc;		const struct machine_desc *machine_desc;
	@@ -433,6 +434,8 @@ static inline bool uboot_arg_invalid(unsigned long addr)
	#define UBOOT_TAG_NONE 0		#define UBOOT_TAG_NONE 0
	#define UBOOT_TAG_CMDLINE 1		#define UBOOT_TAG_CMDLINE 1
	#define UBOOT_TAG_DTB 2		#define UBOOT_TAG_DTB 2
			/* We always pass 0 as magic from U-boot */
			#define UBOOT_MAGIC_VALUE 0

	void __init handle_uboot_args(void)		void __init handle_uboot_args(void)
	{		{
	@@ -448,6 +451,11 @@ void __init handle_uboot_args(void)
	goto ignore_uboot_args;		goto ignore_uboot_args;
	}		}

			if (uboot_magic != UBOOT_MAGIC_VALUE) {
			pr_warn(IGNORE_ARGS "non zero uboot magic\n");
			goto ignore_uboot_args;
			}

	if (uboot_tag != UBOOT_TAG_NONE &&		if (uboot_tag != UBOOT_TAG_NONE &&
	uboot_arg_invalid((unsigned long)uboot_arg)) {		uboot_arg_invalid((unsigned long)uboot_arg)) {
	pr_warn(IGNORE_ARGS "invalid uboot arg: '%px'\n", uboot_arg);		pr_warn(IGNORE_ARGS "invalid uboot arg: '%px'\n", uboot_arg);

arch/arm/crypto/sha256-armv4.pl

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -205,10 +205,11 @@ K256:
	.global sha256_block_data_order		.global sha256_block_data_order
	.type sha256_block_data_order,%function		.type sha256_block_data_order,%function
	sha256_block_data_order:		sha256_block_data_order:
			.Lsha256_block_data_order:
	#if __ARM_ARCH__<7		#if __ARM_ARCH__<7
	sub r3,pc,#8 @ sha256_block_data_order		sub r3,pc,#8 @ sha256_block_data_order
	#else		#else
	adr r3,sha256_block_data_order		adr r3,.Lsha256_block_data_order
	#endif		#endif
	#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)		#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
	ldr r12,.LOPENSSL_armcap		ldr r12,.LOPENSSL_armcap