Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2659b2b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.24 into android-4.9 



Changes in 4.9.24:
	cgroup, kthread: close race window where new kthreads can be migrated to non-root cgroups
	tcmu: Fix possible overwrite of t_data_sg's last iov[]
	tcmu: Fix wrongly calculating of the base_command_size
	tcmu: Skip Data-Out blocks before gathering Data-In buffer for BIDI case
	thp: fix MADV_DONTNEED vs. MADV_FREE race
	thp: fix MADV_DONTNEED vs clear soft dirty race
	zsmalloc: expand class bit
	orangefs: free superblock when mount fails
	drm/nouveau/mpeg: mthd returns true on success now
	drm/nouveau/mmu/nv4a: use nv04 mmu rather than the nv44 one
	drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit()
	CIFS: reconnect thread reschedule itself
	CIFS: store results of cifs_reopen_file to avoid infinite wait
	Input: xpad - add support for Razer Wildcat gamepad
	perf/x86: Avoid exposing wrong/stale data in intel_pmu_lbr_read_32()
	x86/efi: Don't try to reserve runtime regions
	x86/signals: Fix lower/upper bound reporting in compat siginfo
	x86, pmem: fix broken __copy_user_nocache cache-bypass assumptions
	x86/vdso: Ensure vdso32_enabled gets set to valid values only
	x86/vdso: Plug race between mapping and ELF header setup
	acpi, nfit, libnvdimm: fix interleave set cookie calculation (64-bit comparison)
	ACPI / scan: Set the visited flag for all enumerated devices
	parisc: fix bugs in pa_memcpy
	efi/libstub: Skip GOP with PIXEL_BLT_ONLY format
	efi/fb: Avoid reconfiguration of BAR that covers the framebuffer
	iscsi-target: Fix TMR reference leak during session shutdown
	iscsi-target: Drop work-around for legacy GlobalSAN initiator
	scsi: sr: Sanity check returned mode data
	scsi: sd: Consider max_xfer_blocks if opt_xfer_blocks is unusable
	scsi: qla2xxx: Add fix to read correct register value for ISP82xx.
	scsi: sd: Fix capacity calculation with 32-bit sector_t
	target: Avoid mappedlun symlink creation during lun shutdown
	xen, fbfront: fix connecting to backend
	new privimitive: iov_iter_revert()
	make skb_copy_datagram_msg() et.al. preserve ->msg_iter on error
	libnvdimm: fix blk free space accounting
	libnvdimm: fix reconfig_mutex, mmap_sem, and jbd2_handle lockdep splat
	can: ifi: use correct register to read rx status
	pwm: rockchip: State of PWM clock should synchronize with PWM enabled state
	cpufreq: Bring CPUs up even if cpufreq_online() failed
	irqchip/irq-imx-gpcv2: Fix spinlock initialization
	ftrace: Fix removing of second function probe
	char: lack of bool string made CONFIG_DEVPORT always on
	Revert "MIPS: Lantiq: Fix cascaded IRQ setup"
	kvm: fix page struct leak in handle_vmon
	zram: do not use copy_page with non-page aligned address
	ftrace: Fix function pid filter on instances
	crypto: algif_aead - Fix bogus request dereference in completion function
	crypto: ahash - Fix EINPROGRESS notification callback
	parisc: Fix get_user() for 64-bit value on 32-bit kernel
	ath9k: fix NULL pointer dereference
	dvb-usb-v2: avoid use-after-free
	ext4: fix inode checksum calculation problem if i_extra_size is small
	mm: memcontrol: use special workqueue for creating per-memcg caches
	drm/nouveau/disp/mcp7x: disable dptmds workaround
	nbd: use loff_t for blocksize and nbd_set_size args
	nbd: fix 64-bit division
	ASoC: Intel: select DW_DMAC_CORE since it's mandatory
	platform/x86: acer-wmi: setup accelerometer when machine has appropriate notify event
	x86/xen: Fix APIC id mismatch warning on Intel
	ACPI / EC: Use busy polling mode when GPE is not enabled
	rtc: tegra: Implement clock handling
	mm: Tighten x86 /dev/mem with zeroing reads
	dvb-usb: don't use stack for firmware load
	dvb-usb-firmware: don't do DMA on stack
	cxusb: Use a dma capable buffer also for reading
	virtio-console: avoid DMA from stack
	net: ipv6: check route protocol when deleting routes
	sctp: deny peeloff operation on asocs with threads sleeping on it
	Linux 4.9.24

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 67f252c8 2f5e58ec

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 23

SUBLEVEL = 24

EXTRAVERSION =

NAME = Roaring Lionus

arch/mips/lantiq/irq.c

+21 −17
Original line number Diff line number Diff line
@@ -269,11 +269,6 @@ static void ltq_hw5_irqdispatch(void) 
DEFINE_HWx_IRQDISPATCH(5)

#endif



static void ltq_hw_irq_handler(struct irq_desc *desc)

{

	ltq_hw_irqdispatch(irq_desc_get_irq(desc) - 2);

}



#ifdef CONFIG_MIPS_MT_SMP

void __init arch_init_ipiirq(int irq, struct irqaction *action)

{
@@ -318,19 +313,23 @@ static struct irqaction irq_call = { 
asmlinkage void plat_irq_dispatch(void)

{

	unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;

	int irq;

	unsigned int i;



	if (!pending) {

		spurious_interrupt();

		return;

	if ((MIPS_CPU_TIMER_IRQ == 7) && (pending & CAUSEF_IP7)) {

		do_IRQ(MIPS_CPU_TIMER_IRQ);

		goto out;

	} else {

		for (i = 0; i < MAX_IM; i++) {

			if (pending & (CAUSEF_IP2 << i)) {

				ltq_hw_irqdispatch(i);

				goto out;

			}

		}



	pending >>= CAUSEB_IP;

	while (pending) {

		irq = fls(pending) - 1;

		do_IRQ(MIPS_CPU_IRQ_BASE + irq);

		pending &= ~BIT(irq);

	}

	pr_alert("Spurious IRQ: CAUSE=0x%08x\n", read_c0_status());



out:

	return;

}



static int icu_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)
@@ -355,6 +354,11 @@ static const struct irq_domain_ops irq_domain_ops = { 
	.map = icu_map,

};



static struct irqaction cascade = {

	.handler = no_action,

	.name = "cascade",

};



int __init icu_of_init(struct device_node *node, struct device_node *parent)

{

	struct device_node *eiu_node;
@@ -386,7 +390,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent) 
	mips_cpu_irq_init();



	for (i = 0; i < MAX_IM; i++)

		irq_set_chained_handler(i + 2, ltq_hw_irq_handler);

		setup_irq(i + 2, &cascade);



	if (cpu_has_vint) {

		pr_info("Setting up vectored interrupts\n");

arch/parisc/include/asm/uaccess.h

+55 −31
Original line number Diff line number Diff line
@@ -42,10 +42,10 @@ static inline long access_ok(int type, const void __user * addr, 
#define get_user __get_user



#if !defined(CONFIG_64BIT)

#define LDD_USER(ptr)		__get_user_asm64(ptr)

#define LDD_USER(val, ptr)	__get_user_asm64(val, ptr)

#define STD_USER(x, ptr)	__put_user_asm64(x, ptr)

#else

#define LDD_USER(ptr)		__get_user_asm("ldd", ptr)

#define LDD_USER(val, ptr)	__get_user_asm(val, "ldd", ptr)

#define STD_USER(x, ptr)	__put_user_asm("std", x, ptr)

#endif
@@ -100,63 +100,87 @@ struct exception_data { 
		" mtsp %0,%%sr2\n\t"		\

		: : "r"(get_fs()) : )



#define __get_user(x, ptr)                               \

#define __get_user_internal(val, ptr)			\

({							\

	register long __gu_err __asm__ ("r8") = 0;	\

	register long __gu_val;				 \

							\

	load_sr2();					 \

	switch (sizeof(*(ptr))) {			\

	    case 1: __get_user_asm("ldb", ptr); break;   \

	    case 2: __get_user_asm("ldh", ptr); break;   \

	    case 4: __get_user_asm("ldw", ptr); break;   \

	    case 8: LDD_USER(ptr);  break;		 \

	    default: BUILD_BUG(); break;		 \

	case 1: __get_user_asm(val, "ldb", ptr); break;	\

	case 2: __get_user_asm(val, "ldh", ptr); break; \

	case 4: __get_user_asm(val, "ldw", ptr); break; \

	case 8: LDD_USER(val, ptr); break;		\

	default: BUILD_BUG();				\

	}						\

							\

	(x) = (__force __typeof__(*(ptr))) __gu_val;	 \

	__gu_err;					\

})



#define __get_user_asm(ldx, ptr)                        \

#define __get_user(val, ptr)				\

({							\

	load_sr2();					\

	__get_user_internal(val, ptr);			\

})



#define __get_user_asm(val, ldx, ptr)			\

{							\

	register long __gu_val;				\

							\

	__asm__("1: " ldx " 0(%%sr2,%2),%0\n"		\

		"9:\n"					\

		ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b)	\

		: "=r"(__gu_val), "=r"(__gu_err)        \

		: "r"(ptr), "1"(__gu_err));

		: "r"(ptr), "1"(__gu_err));		\

							\

	(val) = (__force __typeof__(*(ptr))) __gu_val;	\

}



#if !defined(CONFIG_64BIT)



#define __get_user_asm64(ptr) 				\

#define __get_user_asm64(val, ptr)			\

{							\

	union {						\

		unsigned long long	l;		\

		__typeof__(*(ptr))	t;		\

	} __gu_tmp;					\

							\

	__asm__("   copy %%r0,%R0\n"			\

		"1: ldw 0(%%sr2,%2),%0\n"		\

		"2: ldw 4(%%sr2,%2),%R0\n"		\

		"9:\n"					\

		ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 9b)	\

		ASM_EXCEPTIONTABLE_ENTRY_EFAULT(2b, 9b)	\

		: "=r"(__gu_val), "=r"(__gu_err)	\

		: "r"(ptr), "1"(__gu_err));

		: "=&r"(__gu_tmp.l), "=r"(__gu_err)	\

		: "r"(ptr), "1"(__gu_err));		\

							\

	(val) = __gu_tmp.t;				\

}



#endif /* !defined(CONFIG_64BIT) */





#define __put_user(x, ptr)                                      \

#define __put_user_internal(x, ptr)				\

({								\

	register long __pu_err __asm__ ("r8") = 0;      	\

        __typeof__(*(ptr)) __x = (__typeof__(*(ptr)))(x);	\

								\

	load_sr2();						\

	switch (sizeof(*(ptr))) {				\

	case 1: __put_user_asm("stb", __x, ptr); break;		\

	case 2: __put_user_asm("sth", __x, ptr); break;		\

	case 4: __put_user_asm("stw", __x, ptr); break;		\

	case 8: STD_USER(__x, ptr); break;			\

	    default: BUILD_BUG(); break;			\

	default: BUILD_BUG();					\

	}							\

								\

	__pu_err;						\

})



#define __put_user(x, ptr)					\

({								\

	load_sr2();						\

	__put_user_internal(x, ptr);				\

})





/*

 * The "__put_user/kernel_asm()" macros tell gcc they read from memory

 * instead of writing. This is because they do not write to any memory

arch/parisc/lib/lusercopy.S

+14 −13
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ ENTRY_CFI(pa_memcpy) 
	add	dst,len,end



	/* short copy with less than 16 bytes? */

	cmpib,>>=,n 15,len,.Lbyte_loop

	cmpib,COND(>>=),n 15,len,.Lbyte_loop



	/* same alignment? */

	xor	src,dst,t0
@@ -216,7 +216,7 @@ ENTRY_CFI(pa_memcpy) 
	/* loop until we are 64-bit aligned */

.Lalign_loop64:

	extru	dst,31,3,t1

	cmpib,=,n	0,t1,.Lcopy_loop_16

	cmpib,=,n	0,t1,.Lcopy_loop_16_start

20:	ldb,ma	1(srcspc,src),t1

21:	stb,ma	t1,1(dstspc,dst)

	b	.Lalign_loop64
@@ -225,6 +225,7 @@ ENTRY_CFI(pa_memcpy) 
	ASM_EXCEPTIONTABLE_ENTRY(20b,.Lcopy_done)

	ASM_EXCEPTIONTABLE_ENTRY(21b,.Lcopy_done)



.Lcopy_loop_16_start:

	ldi	31,t0

.Lcopy_loop_16:

	cmpb,COND(>>=),n t0,len,.Lword_loop
@@ -267,7 +268,7 @@ ENTRY_CFI(pa_memcpy) 
	/* loop until we are 32-bit aligned */

.Lalign_loop32:

	extru	dst,31,2,t1

	cmpib,=,n	0,t1,.Lcopy_loop_4

	cmpib,=,n	0,t1,.Lcopy_loop_8

20:	ldb,ma	1(srcspc,src),t1

21:	stb,ma	t1,1(dstspc,dst)

	b	.Lalign_loop32
@@ -277,7 +278,7 @@ ENTRY_CFI(pa_memcpy) 
	ASM_EXCEPTIONTABLE_ENTRY(21b,.Lcopy_done)





.Lcopy_loop_4:

.Lcopy_loop_8:

	cmpib,COND(>>=),n 15,len,.Lbyte_loop



10:	ldw	0(srcspc,src),t1
@@ -299,7 +300,7 @@ ENTRY_CFI(pa_memcpy) 
	ASM_EXCEPTIONTABLE_ENTRY(16b,.Lcopy_done)

	ASM_EXCEPTIONTABLE_ENTRY(17b,.Lcopy_done)



	b	.Lcopy_loop_4

	b	.Lcopy_loop_8

	ldo	-16(len),len



.Lbyte_loop:
@@ -324,7 +325,7 @@ ENTRY_CFI(pa_memcpy) 
.Lunaligned_copy:

	/* align until dst is 32bit-word-aligned */

	extru	dst,31,2,t1

	cmpib,COND(=),n	0,t1,.Lcopy_dstaligned

	cmpib,=,n	0,t1,.Lcopy_dstaligned

20:	ldb	0(srcspc,src),t1

	ldo	1(src),src

21:	stb,ma	t1,1(dstspc,dst)
@@ -362,7 +363,7 @@ ENTRY_CFI(pa_memcpy) 
	cmpiclr,<> 1,t0,%r0

	b,n .Lcase1

.Lcase0:

	cmpb,= %r0,len,.Lcda_finish

	cmpb,COND(=) %r0,len,.Lcda_finish

	nop



1:	ldw,ma 4(srcspc,src), a3
@@ -376,7 +377,7 @@ ENTRY_CFI(pa_memcpy) 
1:	ldw,ma 4(srcspc,src), a3

	ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcda_rdfault)

	ldo -1(len),len

	cmpb,=,n %r0,len,.Ldo0

	cmpb,COND(=),n %r0,len,.Ldo0

.Ldo4:

1:	ldw,ma 4(srcspc,src), a0

	ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcda_rdfault)
@@ -402,7 +403,7 @@ ENTRY_CFI(pa_memcpy) 
1:	stw,ma t0, 4(dstspc,dst)

	ASM_EXCEPTIONTABLE_ENTRY(1b,.Lcopy_done)

	ldo -4(len),len

	cmpb,<> %r0,len,.Ldo4

	cmpb,COND(<>) %r0,len,.Ldo4

	nop

.Ldo0:

	shrpw a2, a3, %sar, t0
@@ -436,14 +437,14 @@ ENTRY_CFI(pa_memcpy) 
	/* fault exception fixup handlers: */

#ifdef CONFIG_64BIT

.Lcopy16_fault:

10:	b	.Lcopy_done

	std,ma	t1,8(dstspc,dst)

	b	.Lcopy_done

10:	std,ma	t1,8(dstspc,dst)

	ASM_EXCEPTIONTABLE_ENTRY(10b,.Lcopy_done)

#endif



.Lcopy8_fault:

10:	b	.Lcopy_done

	stw,ma	t1,4(dstspc,dst)

	b	.Lcopy_done

10:	stw,ma	t1,4(dstspc,dst)

	ASM_EXCEPTIONTABLE_ENTRY(10b,.Lcopy_done)



	.exit

arch/x86/entry/vdso/vdso32-setup.c

+9 −2
Original line number Diff line number Diff line
@@ -30,8 +30,10 @@ static int __init vdso32_setup(char *s) 
{

	vdso32_enabled = simple_strtoul(s, NULL, 0);



	if (vdso32_enabled > 1)

	if (vdso32_enabled > 1) {

		pr_warn("vdso32 values other than 0 and 1 are no longer allowed; vdso disabled\n");

		vdso32_enabled = 0;

	}



	return 1;

}
@@ -62,13 +64,18 @@ subsys_initcall(sysenter_setup); 
/* Register vsyscall32 into the ABI table */

#include <linux/sysctl.h>



static const int zero;

static const int one = 1;



static struct ctl_table abi_table2[] = {

	{

		.procname	= "vsyscall32",

		.data		= &vdso32_enabled,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= (int *)&zero,

		.extra2		= (int *)&one,

	},

	{}

};