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

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

Merge 4.9.264 into android-4.9-q 



Changes in 4.9.264
	net: fec: ptp: avoid register access when ipg clock is disabled
	powerpc/4xx: Fix build errors from mfdcr()
	atm: eni: dont release is never initialized
	atm: lanai: dont run lanai_dev_close if not open
	ixgbe: Fix memleak in ixgbe_configure_clsu32
	net: tehuti: fix error return code in bdx_probe()
	sun/niu: fix wrong RXMAC_BC_FRM_CNT_COUNT count
	nfs: fix PNFS_FLEXFILE_LAYOUT Kconfig default
	NFS: Correct size calculation for create reply length
	net: wan: fix error return code of uhdlc_init()
	atm: uPD98402: fix incorrect allocation
	atm: idt77252: fix null-ptr-dereference
	u64_stats,lockdep: Fix u64_stats_init() vs lockdep
	nfs: we don't support removing system.nfs4_acl
	ia64: fix ia64_syscall_get_set_arguments() for break-based syscalls
	ia64: fix ptrace(PTRACE_SYSCALL_INFO_EXIT) sign
	x86/tlb: Flush global mappings when KAISER is disabled
	squashfs: fix inode lookup sanity checks
	squashfs: fix xattr id and id lookup sanity checks
	arm64: dts: ls1043a: mark crypto engine dma coherent
	bus: omap_l3_noc: mark l3 irqs as IRQF_NO_THREAD
	macvlan: macvlan_count_rx() needs to be aware of preemption
	net: dsa: bcm_sf2: Qualify phydev->dev_flags based on port
	e1000e: add rtnl_lock() to e1000_reset_task
	e1000e: Fix error handling in e1000_set_d0_lplu_state_82571
	net/qlcnic: Fix a use after free in qlcnic_83xx_get_minidump_template
	can: c_can_pci: c_can_pci_remove(): fix use-after-free
	can: c_can: move runtime PM enable/disable to c_can_platform
	can: m_can: m_can_do_rx_poll(): fix extraneous msg loss warning
	mac80211: fix rate mask reset
	net: cdc-phonet: fix data-interface release on probe failure
	RDMA/cxgb4: Fix adapter LE hash errors while destroying ipv6 listening server
	ACPI: scan: Rearrange memory allocation in acpi_device_add()
	ACPI: scan: Use unique number for instance_no
	perf auxtrace: Fix auxtrace queue conflict
	idr: add ida_is_empty
	futex: Use smp_store_release() in mark_wake_futex()
	futex,rt_mutex: Introduce rt_mutex_init_waiter()
	futex: Rework futex_lock_pi() to use rt_mutex_*_proxy_lock()
	futex: Drop hb->lock before enqueueing on the rtmutex
	futex: Avoid freeing an active timer
	futex,rt_mutex: Fix rt_mutex_cleanup_proxy_lock()
	futex: Handle early deadlock return correctly
	futex: Fix (possible) missed wakeup
	locking/futex: Allow low-level atomic operations to return -EAGAIN
	arm64: futex: Bound number of LDXR/STXR loops in FUTEX_WAKE_OP
	futex: Prevent robust futex exit race
	futex: Fix incorrect should_fail_futex() handling
	futex: Handle transient "ownerless" rtmutex state correctly
	can: dev: Move device back to init netns on owning netns delete
	net: sched: validate stab values
	net: qrtr: fix a kernel-infoleak in qrtr_recvmsg()
	mac80211: fix double free in ibss_leave
	xen-blkback: don't leak persistent grants from xen_blkbk_map()
	Linux 4.9.264

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I8c5617c1f82aa378e3ba19d43879065e15457edd
parents 6873b123 1872b07a

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 263

SUBLEVEL = 264

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ 
			ranges = <0x0 0x00 0x1700000 0x100000>;

			reg = <0x00 0x1700000 0x0 0x100000>;

			interrupts = <0 75 0x4>;

			dma-coherent;



			sec_jr0: jr@10000 {

				compatible = "fsl,sec-v5.4-job-ring",

arch/arm64/include/asm/futex.h

+34 −21
Original line number Diff line number Diff line
@@ -23,26 +23,34 @@ 


#include <asm/errno.h>



#define FUTEX_MAX_LOOPS	128 /* What's the largest number you can think of? */



#define __futex_atomic_op(insn, ret, oldval, uaddr, tmp, oparg)		\

do {									\

	unsigned int loops = FUTEX_MAX_LOOPS;				\

	uaccess_enable();						\

									\

	asm volatile(							\

"	prfm	pstl1strm, %2\n"					\

"1:	ldxr	%w1, %2\n"						\

	insn "\n"							\

"2:	stlxr	%w0, %w3, %2\n"						\

"	cbnz	%w0, 1b\n"						\

"	dmb	ish\n"							\

"	cbz	%w0, 3f\n"						\

"	sub	%w4, %w4, %w0\n"					\

"	cbnz	%w4, 1b\n"						\

"	mov	%w0, %w7\n"						\

"3:\n"									\

"	dmb	ish\n"							\

"	.pushsection .fixup,\"ax\"\n"					\

"	.align	2\n"							\

"4:	mov	%w0, %w5\n"						\

"4:	mov	%w0, %w6\n"						\

"	b	3b\n"							\

"	.popsection\n"							\

	_ASM_EXTABLE(1b, 4b)						\

	_ASM_EXTABLE(2b, 4b)						\

	: "=&r" (ret), "=&r" (oldval), "+Q" (*uaddr), "=&r" (tmp)	\

	: "r" (oparg), "Ir" (-EFAULT)					\

	: "=&r" (ret), "=&r" (oldval), "+Q" (*uaddr), "=&r" (tmp),	\

	  "+r" (loops)							\

	: "r" (oparg), "Ir" (-EFAULT), "Ir" (-EAGAIN)			\

	: "memory");							\

	uaccess_disable();						\

} while (0)
@@ -56,23 +64,23 @@ arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr) 


	switch (op) {

	case FUTEX_OP_SET:

		__futex_atomic_op("mov	%w3, %w4",

		__futex_atomic_op("mov	%w3, %w5",

				  ret, oldval, uaddr, tmp, oparg);

		break;

	case FUTEX_OP_ADD:

		__futex_atomic_op("add	%w3, %w1, %w4",

		__futex_atomic_op("add	%w3, %w1, %w5",

				  ret, oldval, uaddr, tmp, oparg);

		break;

	case FUTEX_OP_OR:

		__futex_atomic_op("orr	%w3, %w1, %w4",

		__futex_atomic_op("orr	%w3, %w1, %w5",

				  ret, oldval, uaddr, tmp, oparg);

		break;

	case FUTEX_OP_ANDN:

		__futex_atomic_op("and	%w3, %w1, %w4",

		__futex_atomic_op("and	%w3, %w1, %w5",

				  ret, oldval, uaddr, tmp, ~oparg);

		break;

	case FUTEX_OP_XOR:

		__futex_atomic_op("eor	%w3, %w1, %w4",

		__futex_atomic_op("eor	%w3, %w1, %w5",

				  ret, oldval, uaddr, tmp, oparg);

		break;

	default:
@@ -92,6 +100,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *_uaddr, 
			      u32 oldval, u32 newval)

{

	int ret = 0;

	unsigned int loops = FUTEX_MAX_LOOPS;

	u32 val, tmp;

	u32 __user *uaddr;
@@ -103,20 +112,24 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *_uaddr, 
	asm volatile("// futex_atomic_cmpxchg_inatomic\n"

"	prfm	pstl1strm, %2\n"

"1:	ldxr	%w1, %2\n"

"	sub	%w3, %w1, %w4\n"

"	cbnz	%w3, 3f\n"

"2:	stlxr	%w3, %w5, %2\n"

"	cbnz	%w3, 1b\n"

"	dmb	ish\n"

"	sub	%w3, %w1, %w5\n"

"	cbnz	%w3, 4f\n"

"2:	stlxr	%w3, %w6, %2\n"

"	cbz	%w3, 3f\n"

"	sub	%w4, %w4, %w3\n"

"	cbnz	%w4, 1b\n"

"	mov	%w0, %w8\n"

"3:\n"

"	dmb	ish\n"

"4:\n"

"	.pushsection .fixup,\"ax\"\n"

"4:	mov	%w0, %w6\n"

"	b	3b\n"

"5:	mov	%w0, %w7\n"

"	b	4b\n"

"	.popsection\n"

	_ASM_EXTABLE(1b, 4b)

	_ASM_EXTABLE(2b, 4b)

	: "+r" (ret), "=&r" (val), "+Q" (*uaddr), "=&r" (tmp)

	: "r" (oldval), "r" (newval), "Ir" (-EFAULT)

	_ASM_EXTABLE(1b, 5b)

	_ASM_EXTABLE(2b, 5b)

	: "+r" (ret), "=&r" (val), "+Q" (*uaddr), "=&r" (tmp), "+r" (loops)

	: "r" (oldval), "r" (newval), "Ir" (-EFAULT), "Ir" (-EAGAIN)

	: "memory");

	uaccess_disable();

arch/ia64/include/asm/syscall.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static inline void syscall_rollback(struct task_struct *task, 
static inline long syscall_get_error(struct task_struct *task,

				     struct pt_regs *regs)

{

	return regs->r10 == -1 ? regs->r8:0;

	return regs->r10 == -1 ? -regs->r8:0;

}



static inline long syscall_get_return_value(struct task_struct *task,

arch/ia64/kernel/ptrace.c

+18 −6
Original line number Diff line number Diff line
@@ -2144,27 +2144,39 @@ static void syscall_get_set_args_cb(struct unw_frame_info *info, void *data) 
{

	struct syscall_get_set_args *args = data;

	struct pt_regs *pt = args->regs;

	unsigned long *krbs, cfm, ndirty;

	unsigned long *krbs, cfm, ndirty, nlocals, nouts;

	int i, count;



	if (unw_unwind_to_user(info) < 0)

		return;



	/*

	 * We get here via a few paths:

	 * - break instruction: cfm is shared with caller.

	 *   syscall args are in out= regs, locals are non-empty.

	 * - epsinstruction: cfm is set by br.call

	 *   locals don't exist.

	 *

	 * For both cases argguments are reachable in cfm.sof - cfm.sol.

	 * CFM: [ ... | sor: 17..14 | sol : 13..7 | sof : 6..0 ]

	 */

	cfm = pt->cr_ifs;

	nlocals = (cfm >> 7) & 0x7f; /* aka sol */

	nouts = (cfm & 0x7f) - nlocals; /* aka sof - sol */

	krbs = (unsigned long *)info->task + IA64_RBS_OFFSET/8;

	ndirty = ia64_rse_num_regs(krbs, krbs + (pt->loadrs >> 19));



	count = 0;

	if (in_syscall(pt))

		count = min_t(int, args->n, cfm & 0x7f);

		count = min_t(int, args->n, nouts);



	/* Iterate over outs. */

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

		int j = ndirty + nlocals + i + args->i;

		if (args->rw)

			*ia64_rse_skip_regs(krbs, ndirty + i + args->i) =

				args->args[i];

			*ia64_rse_skip_regs(krbs, j) = args->args[i];

		else

			args->args[i] = *ia64_rse_skip_regs(krbs,

				ndirty + i + args->i);

			args->args[i] = *ia64_rse_skip_regs(krbs, j);

	}



	if (!args->rw) {