Commit 4ad9bb85 authored Mar 11, 2020 by Greg Kroah-Hartman

Merge 4.9.216 into android-4.9-q



Changes in 4.9.216
	iwlwifi: pcie: fix rb_allocator workqueue allocation
	ext4: fix potential race between online resizing and write operations
	ext4: fix potential race between s_flex_groups online resizing and access
	ext4: fix potential race between s_group_info online resizing and access
	ipmi:ssif: Handle a possible NULL pointer reference
	drm/msm: Set dma maximum segment size for mdss
	mac80211: consider more elements in parsing CRC
	cfg80211: check wiphy driver existence for drvinfo report
	qmi_wwan: re-add DW5821e pre-production variant
	net: ena: fix potential crash when rxfh key is NULL
	net: ena: add missing ethtool TX timestamping indication
	net: ena: fix incorrect default RSS key
	net: ena: rss: fix failure to get indirection table
	net: ena: rss: store hash function as values and not bits
	net: ena: fix incorrectly saving queue numbers when setting RSS indirection table
	net: ena: ena-com.c: prevent NULL pointer dereference
	cifs: Fix mode output in debugging statements
	cfg80211: add missing policy for NL80211_ATTR_STATUS_CODE
	sysrq: Restore original console_loglevel when sysrq disabled
	sysrq: Remove duplicated sysrq message
	net: fib_rules: Correctly set table field when table number exceeds 8 bits
	net: phy: restore mdio regs in the iproc mdio driver
	ipv6: Fix nlmsg_flags when splitting a multipath route
	ipv6: Fix route replacement with dev-only route
	sctp: move the format error check out of __sctp_sf_do_9_1_abort
	nfc: pn544: Fix occasional HW initialization failure
	net: sched: correct flower port blocking
	ext4: potential crash on allocation error in ext4_alloc_flex_bg_array()
	audit: fix error handling in audit_data_to_entry()
	ACPICA: Introduce ACPI_ACCESS_BYTE_WIDTH() macro
	ACPI: watchdog: Fix gas->access_width usage
	HID: core: fix off-by-one memset in hid_report_raw_event()
	HID: core: increase HID report buffer size to 8KiB
	HID: hiddev: Fix race in in hiddev_disconnect()
	MIPS: VPE: Fix a double free and a memory leak in 'release_vpe()'
	i2c: jz4780: silence log flood on txabrt
	ecryptfs: Fix up bad backport of fe2e082f5da5b4a0a92ae32978f81507ef37ec66
	serial: 8250: Check UPF_IRQ_SHARED in advance
	include/linux/bitops.h: introduce BITS_PER_TYPE
	net: netlink: cap max groups which will be considered in netlink_bind()
	net: ena: make ena rxfh support ETH_RSS_HASH_NO_CHANGE
	namei: only return -ECHILD from follow_dotdot_rcu()
	KVM: Check for a bad hva before dropping into the ghc slow path
	slip: stop double free sl->dev in slip_open
	tuntap: correctly set SOCKWQ_ASYNC_NOSPACE
	drivers: net: xgene: Fix the order of the arguments of 'alloc_etherdev_mqs()'
	perf hists browser: Restore ESC as "Zoom out" of DSO/thread/etc
	mm/huge_memory.c: use head to check huge zero page
	audit: always check the netlink payload length in audit_receive_msg()
	vhost: Check docket sk_family instead of call getname
	serial: ar933x_uart: set UART_CS_{RX,TX}_READY_ORIDE
	usb: gadget: composite: Support more than 500mA MaxPower
	usb: gadget: ffs: ffs_aio_cancel(): Save/restore IRQ flags
	usb: gadget: serial: fix Tx stall after buffer overflow
	drm: msm: Fix return type of dsi_mgr_connector_mode_valid for kCFI
	drm/msm/dsi: save pll state before dsi host is powered off
	net: ks8851-ml: Remove 8-bit bus accessors
	net: ks8851-ml: Fix 16-bit data access
	net: ks8851-ml: Fix 16-bit IO operation
	watchdog: da9062: do not ping the hw during stop()
	s390/cio: cio_ignore_proc_seq_next should increase position index
	cifs: don't leak -EAGAIN for stat() during reconnect
	usb: storage: Add quirk for Samsung Fit flash
	usb: quirks: add NO_LPM quirk for Logitech Screen Share
	usb: core: hub: do error out if usb_autopm_get_interface() fails
	usb: core: port: do error out if usb_autopm_get_interface() fails
	vgacon: Fix a UAF in vgacon_invert_region
	fat: fix uninit-memory access for partial initialized inode
	tty:serial:mvebu-uart:fix a wrong return
	vt: selection, close sel_buffer race
	vt: selection, push console lock down
	vt: selection, push sel_lock up
	x86/pkeys: Manually set X86_FEATURE_OSPKE to preserve existing changes
	dmaengine: tegra-apb: Fix use-after-free
	dmaengine: tegra-apb: Prevent race conditions of tasklet vs free list
	ARM: dts: ls1021a: Restore MDIO compatible to gianfar
	ASoC: pcm: Fix possible buffer overflow in dpcm state sysfs output
	ASoC: pcm512x: Fix unbalanced regulator enable call in probe error path
	ASoC: dapm: Correct DAPM handling of active widgets during shutdown
	RDMA/iwcm: Fix iwcm work deallocation
	RMDA/cm: Fix missing ib_cm_destroy_id() in ib_cm_insert_listen()
	ARM: imx: build v7_cpu_resume() unconditionally
	hwmon: (adt7462) Fix an error return in ADT7462_REG_VOLT()
	dmaengine: coh901318: Fix a double lock bug in dma_tc_handle()
	powerpc: fix hardware PMU exception bug on PowerVM compatibility mode systems
	dm cache: fix a crash due to incorrect work item cancelling
	crypto: algif_skcipher - use ZERO_OR_NULL_PTR in skcipher_recvmsg_async
	Linux 4.9.216

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

parents f1aac226 19c646f0

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 4		VERSION = 4
	PATCHLEVEL = 9		PATCHLEVEL = 9
	SUBLEVEL = 215		SUBLEVEL = 216
	EXTRAVERSION =		EXTRAVERSION =
	NAME = Roaring Lionus		NAME = Roaring Lionus

arch/arm/boot/dts/ls1021a.dtsi

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -505,7 +505,7 @@
	};		};

	mdio0: mdio@2d24000 {		mdio0: mdio@2d24000 {
	compatible = "fsl,etsec2-mdio";		compatible = "gianfar";
	device_type = "mdio";		device_type = "mdio";
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <0>;		#size-cells = <0>;
	@@ -513,7 +513,7 @@
	};		};

	mdio1: mdio@2d64000 {		mdio1: mdio@2d64000 {
	compatible = "fsl,etsec2-mdio";		compatible = "gianfar";
	device_type = "mdio";		device_type = "mdio";
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <0>;		#size-cells = <0>;

arch/arm/mach-imx/Makefile

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -86,6 +86,8 @@ AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
	obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o		obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o
	obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o		obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o
	endif		endif
			AFLAGS_resume-imx6.o :=-Wa,-march=armv7-a
			obj-$(CONFIG_SOC_IMX6) += resume-imx6.o
	obj-$(CONFIG_SOC_IMX6) += pm-imx6.o		obj-$(CONFIG_SOC_IMX6) += pm-imx6.o

	obj-$(CONFIG_SOC_IMX1) += mach-imx1.o		obj-$(CONFIG_SOC_IMX1) += mach-imx1.o

arch/arm/mach-imx/common.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -112,17 +112,17 @@ void imx_cpu_die(unsigned int cpu);
	int imx_cpu_kill(unsigned int cpu);		int imx_cpu_kill(unsigned int cpu);

	#ifdef CONFIG_SUSPEND		#ifdef CONFIG_SUSPEND
	void v7_cpu_resume(void);
	void imx53_suspend(void __iomem *ocram_vbase);		void imx53_suspend(void __iomem *ocram_vbase);
	extern const u32 imx53_suspend_sz;		extern const u32 imx53_suspend_sz;
	void imx6_suspend(void __iomem *ocram_vbase);		void imx6_suspend(void __iomem *ocram_vbase);
	#else		#else
	static inline void v7_cpu_resume(void) {}
	static inline void imx53_suspend(void __iomem *ocram_vbase) {}		static inline void imx53_suspend(void __iomem *ocram_vbase) {}
	static const u32 imx53_suspend_sz;		static const u32 imx53_suspend_sz;
	static inline void imx6_suspend(void __iomem *ocram_vbase) {}		static inline void imx6_suspend(void __iomem *ocram_vbase) {}
	#endif		#endif

			void v7_cpu_resume(void);

	void imx6_pm_ccm_init(const char *ccm_compat);		void imx6_pm_ccm_init(const char *ccm_compat);
	void imx6q_pm_init(void);		void imx6q_pm_init(void);
	void imx6dl_pm_init(void);		void imx6dl_pm_init(void);

arch/arm/mach-imx/resume-imx6.S

0 → 100644

+24 −0

Original line number	Original line	Diff line number	Diff line
			/* SPDX-License-Identifier: GPL-2.0-or-later */
			/*
			* Copyright 2014 Freescale Semiconductor, Inc.
			*/

			#include <linux/linkage.h>
			#include <asm/assembler.h>
			#include <asm/asm-offsets.h>
			#include <asm/hardware/cache-l2x0.h>
			#include "hardware.h"

			/*
			* The following code must assume it is running from physical address
			* where absolute virtual addresses to the data section have to be
			* turned into relative ones.
			*/

			ENTRY(v7_cpu_resume)
			bl v7_invalidate_l1
			#ifdef CONFIG_CACHE_L2X0
			bl l2c310_early_resume
			#endif
			b cpu_resume
			ENDPROC(v7_cpu_resume)