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

Merge 4.9.170 into android-4.9-q



Changes in 4.9.170
	ARC: u-boot args: check that magic number is correct
	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
	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/int340x_thermal: Add additional UUIDs
	thermal/int340x_thermal: fix mode setting
	tools/power turbostat: return the exit status of a command
	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 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
	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
	serial: uartps: console_setup() can't be placed to init section
	HID: i2c-hid: override HID descriptors for certain devices
	ARM: samsung: Limit SAMSUNG_PM_CHECK config option to non-Exynos platforms
	ACPI / SBS: Fix GPE storm on recent MacBookPro's
	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: Add tests for NULL pointer dereference
	ARM: 8839/1: kprobe: make patch_lock a raw_spinlock_t
	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
	tpm/tpm_crb: Avoid unaligned reads in crb_recv()
	net: stmmac: Set dma ring length before enabling the DMA
	appletalk: Fix compile regression
	Linux 4.9.170

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

parents e3923abb ad387ec4

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 169
		SUBLEVEL = 170
		EXTRAVERSION =
		NAME = Roaring Lionus

arch/arc/kernel/head.S

+1 −0

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

arch/arc/kernel/setup.c

+8 −0

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

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

		const struct machine_desc *machine_desc;
		@@ -400,6 +401,8 @@ static inline bool uboot_arg_invalid(unsigned long addr)
		#define UBOOT_TAG_NONE 0
		#define UBOOT_TAG_CMDLINE 1
		#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)
		{
		@@ -415,6 +418,11 @@ void __init handle_uboot_args(void)
		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 &&
		uboot_arg_invalid((unsigned long)uboot_arg)) {
		pr_warn(IGNORE_ARGS "invalid uboot arg: '%px'\n", uboot_arg);

arch/arm/crypto/sha256-armv4.pl

+2 −1

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

arch/arm/crypto/sha256-core.S_shipped

+2 −1

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