Commit 320d53a9 authored Apr 24, 2018 by Greg Kroah-Hartman

Merge 4.9.96 into android-4.9



Changes in 4.9.96
	tty: make n_tty_read() always abort if hangup is in progress
	ubifs: Check ubifs_wbuf_sync() return code
	ubi: fastmap: Don't flush fastmap work on detach
	ubi: Fix error for write access
	ubi: Reject MLC NAND
	fs/reiserfs/journal.c: add missing resierfs_warning() arg
	resource: fix integer overflow at reallocation
	ipc/shm: fix use-after-free of shm file via remap_file_pages()
	mm, slab: reschedule cache_reap() on the same CPU
	usb: musb: gadget: misplaced out of bounds check
	usb: gadget: udc: core: update usb_ep_queue() documentation
	ARM: dts: at91: at91sam9g25: fix mux-mask pinctrl property
	ARM: dts: exynos: Fix IOMMU support for GScaler devices on Exynos5250
	ARM: dts: at91: sama5d4: fix pinctrl compatible string
	spi: Fix scatterlist elements size in spi_map_buf
	xen-netfront: Fix hang on device removal
	regmap: Fix reversed bounds check in regmap_raw_write()
	ACPI / video: Add quirk to force acpi-video backlight on Samsung 670Z5E
	ACPI / hotplug / PCI: Check presence of slot itself in get_slot_status()
	USB: gadget: f_midi: fixing a possible double-free in f_midi
	USB:fix USB3 devices behind USB3 hubs not resuming at hibernate thaw
	usb: dwc3: pci: Properly cleanup resource
	smb3: Fix root directory when server returns inode number of zero
	HID: i2c-hid: fix size check and type usage
	powerpc/powernv: Handle unknown OPAL errors in opal_nvram_write()
	powerpc/64: Fix smp_wmb barrier definition use use lwsync consistently
	powerpc/powernv: define a standard delay for OPAL_BUSY type retry loops
	powerpc/powernv: Fix OPAL NVRAM driver OPAL_BUSY loops
	HID: Fix hid_report_len usage
	HID: core: Fix size as type u32
	ASoC: ssm2602: Replace reg_default_raw with reg_default
	thunderbolt: Resume control channel after hibernation image is created
	irqchip/gic: Take lock when updating irq type
	random: use a tighter cap in credit_entropy_bits_safe()
	jbd2: if the journal is aborted then don't allow update of the log tail
	ext4: don't update checksum of new initialized bitmaps
	ext4: protect i_disksize update by i_data_sem in direct write path
	ext4: fail ext4_iget for root directory if unallocated
	RDMA/ucma: Don't allow setting RDMA_OPTION_IB_PATH without an RDMA device
	RDMA/rxe: Fix an out-of-bounds read
	ALSA: pcm: Fix UAF at PCM release via PCM timer access
	IB/srp: Fix srp_abort()
	IB/srp: Fix completion vector assignment algorithm
	dmaengine: at_xdmac: fix rare residue corruption
	libnvdimm, namespace: use a safe lookup for dimm device name
	nfit, address-range-scrub: fix scrub in-progress reporting
	um: Compile with modern headers
	um: Use POSIX ucontext_t instead of struct ucontext
	iommu/vt-d: Fix a potential memory leak
	mmc: jz4740: Fix race condition in IRQ mask update
	clk: mvebu: armada-38x: add support for 1866MHz variants
	clk: mvebu: armada-38x: add support for missing clocks
	clk: fix false-positive Wmaybe-uninitialized warning
	clk: bcm2835: De-assert/assert PLL reset signal when appropriate
	pwm: rcar: Fix a condition to prevent mismatch value setting to duty
	thermal: imx: Fix race condition in imx_thermal_probe()
	dt-bindings: clock: mediatek: add binding for fixed-factor clock axisel_d4
	watchdog: f71808e_wdt: Fix WD_EN register read
	vfio/pci: Virtualize Maximum Read Request Size
	ALSA: pcm: Use ERESTARTSYS instead of EINTR in OSS emulation
	ALSA: pcm: Avoid potential races between OSS ioctls and read/write
	ALSA: pcm: Return -EBUSY for OSS ioctls changing busy streams
	ALSA: pcm: Fix mutex unbalance in OSS emulation ioctls
	ALSA: pcm: Fix endless loop for XRUN recovery in OSS emulation
	ext4: don't allow r/w mounts if metadata blocks overlap the superblock
	drm/amdgpu: Add an ATPX quirk for hybrid laptop
	drm/amdgpu: Fix always_valid bos multiple LRU insertions.
	drm/amdgpu: Fix PCIe lane width calculation
	drm/rockchip: Clear all interrupts before requesting the IRQ
	drm/radeon: Fix PCIe lane width calculation
	ALSA: line6: Use correct endpoint type for midi output
	ALSA: rawmidi: Fix missing input substream checks in compat ioctls
	ALSA: hda - New VIA controller suppor no-snoop path
	random: fix crng_ready() test
	random: crng_reseed() should lock the crng instance that it is modifying
	random: add new ioctl RNDRESEEDCRNG
	HID: hidraw: Fix crash on HIDIOCGFEATURE with a destroyed device
	MIPS: uaccess: Add micromips clobbers to bzero invocation
	MIPS: memset.S: EVA & fault support for small_memset
	MIPS: memset.S: Fix return of __clear_user from Lpartial_fixup
	MIPS: memset.S: Fix clobber of v1 in last_fixup
	powerpc/eeh: Fix enabling bridge MMIO windows
	powerpc/lib: Fix off-by-one in alternate feature patching
	udf: Fix leak of UTF-16 surrogates into encoded strings
	jffs2_kill_sb(): deal with failed allocations
	hypfs_kill_super(): deal with failed allocations
	orangefs_kill_sb(): deal with allocation failures
	rpc_pipefs: fix double-dput()
	Don't leak MNT_INTERNAL away from internal mounts
	autofs: mount point create should honour passed in mode
	mm/filemap.c: fix NULL pointer in page_cache_tree_insert()
	fanotify: fix logic of events on child
	writeback: safer lock nesting
	block/mq: fix potential deadlock during cpu hotplug
	Linux 4.9.96

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

parents a35dc729 5cd35f3e

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 4		VERSION = 4
	PATCHLEVEL = 9		PATCHLEVEL = 9
	SUBLEVEL = 95		SUBLEVEL = 96
	EXTRAVERSION =		EXTRAVERSION =
	NAME = Roaring Lionus		NAME = Roaring Lionus

arch/arm/boot/dts/at91sam9g25.dtsi

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,7 @@
	atmel,mux-mask = <		atmel,mux-mask = <
	/* A B C */		/* A B C */
	0xffffffff 0xffe0399f 0xc000001c /* pioA */		0xffffffff 0xffe0399f 0xc000001c /* pioA */
	0x0007ffff 0x8000fe3f 0x00000000 /* pioB */		0x0007ffff 0x00047e3f 0x00000000 /* pioB */
	0x80000000 0x07c0ffff 0xb83fffff /* pioC */		0x80000000 0x07c0ffff 0xb83fffff /* pioC */
	0x003fffff 0x003f8000 0x00000000 /* pioD */		0x003fffff 0x003f8000 0x00000000 /* pioD */
	>;		>;

arch/arm/boot/dts/exynos5250.dtsi

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -640,7 +640,7 @@
	power-domains = <&pd_gsc>;		power-domains = <&pd_gsc>;
	clocks = <&clock CLK_GSCL0>;		clocks = <&clock CLK_GSCL0>;
	clock-names = "gscl";		clock-names = "gscl";
	iommu = <&sysmmu_gsc0>;		iommus = <&sysmmu_gsc0>;
	};		};

	gsc_1: gsc@13e10000 {		gsc_1: gsc@13e10000 {
	@@ -650,7 +650,7 @@
	power-domains = <&pd_gsc>;		power-domains = <&pd_gsc>;
	clocks = <&clock CLK_GSCL1>;		clocks = <&clock CLK_GSCL1>;
	clock-names = "gscl";		clock-names = "gscl";
	iommu = <&sysmmu_gsc1>;		iommus = <&sysmmu_gsc1>;
	};		};

	gsc_2: gsc@13e20000 {		gsc_2: gsc@13e20000 {
	@@ -660,7 +660,7 @@
	power-domains = <&pd_gsc>;		power-domains = <&pd_gsc>;
	clocks = <&clock CLK_GSCL2>;		clocks = <&clock CLK_GSCL2>;
	clock-names = "gscl";		clock-names = "gscl";
	iommu = <&sysmmu_gsc2>;		iommus = <&sysmmu_gsc2>;
	};		};

	gsc_3: gsc@13e30000 {		gsc_3: gsc@13e30000 {
	@@ -670,7 +670,7 @@
	power-domains = <&pd_gsc>;		power-domains = <&pd_gsc>;
	clocks = <&clock CLK_GSCL3>;		clocks = <&clock CLK_GSCL3>;
	clock-names = "gscl";		clock-names = "gscl";
	iommu = <&sysmmu_gsc3>;		iommus = <&sysmmu_gsc3>;
	};		};

	hdmi: hdmi@14530000 {		hdmi: hdmi@14530000 {

arch/arm/boot/dts/sama5d4.dtsi

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1362,7 +1362,7 @@
	pinctrl@fc06a000 {		pinctrl@fc06a000 {
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <1>;		#size-cells = <1>;
	compatible = "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus";		compatible = "atmel,sama5d3-pinctrl", "atmel,at91sam9x5-pinctrl", "simple-bus";
	ranges = <0xfc068000 0xfc068000 0x100		ranges = <0xfc068000 0xfc068000 0x100
	0xfc06a000 0xfc06a000 0x4000>;		0xfc06a000 0xfc06a000 0x4000>;
	/* WARNING: revisit as pin spec has changed */		/* WARNING: revisit as pin spec has changed */

arch/mips/include/asm/uaccess.h

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1257,6 +1257,13 @@ __clear_user(void __user *addr, __kernel_size_t size)
	{		{
	__kernel_size_t res;		__kernel_size_t res;

			#ifdef CONFIG_CPU_MICROMIPS
			/* micromips memset / bzero also clobbers t7 & t8 */
			#define bzero_clobbers "$4", "$5", "$6", __UA_t0, __UA_t1, "$15", "$24", "$31"
			#else
			#define bzero_clobbers "$4", "$5", "$6", __UA_t0, __UA_t1, "$31"
			#endif /* CONFIG_CPU_MICROMIPS */

	if (eva_kernel_access()) {		if (eva_kernel_access()) {
	__asm__ __volatile__(		__asm__ __volatile__(
	"move\t$4, %1\n\t"		"move\t$4, %1\n\t"
	@@ -1266,7 +1273,7 @@ __clear_user(void __user *addr, __kernel_size_t size)
	"move\t%0, $6"		"move\t%0, $6"
	: "=r" (res)		: "=r" (res)
	: "r" (addr), "r" (size)		: "r" (addr), "r" (size)
	: "$4", "$5", "$6", __UA_t0, __UA_t1, "$31");		: bzero_clobbers);
	} else {		} else {
	might_fault();		might_fault();
	__asm__ __volatile__(		__asm__ __volatile__(
	@@ -1277,7 +1284,7 @@ __clear_user(void __user *addr, __kernel_size_t size)
	"move\t%0, $6"		"move\t%0, $6"
	: "=r" (res)		: "=r" (res)
	: "r" (addr), "r" (size)		: "r" (addr), "r" (size)
	: "$4", "$5", "$6", __UA_t0, __UA_t1, "$31");		: bzero_clobbers);
	}		}

	return res;		return res;