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

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

Merge 4.9.101 into android-4.9 



Changes in 4.9.101
	8139too: Use disable_irq_nosync() in rtl8139_poll_controller()
	bridge: check iface upper dev when setting master via ioctl
	dccp: fix tasklet usage
	ipv4: fix memory leaks in udp_sendmsg, ping_v4_sendmsg
	llc: better deal with too small mtu
	net: ethernet: sun: niu set correct packet size in skb
	net: ethernet: ti: cpsw: fix packet leaking in dual_mac mode
	net/mlx4_en: Verify coalescing parameters are in range
	net/mlx5: E-Switch, Include VF RDMA stats in vport statistics
	net_sched: fq: take care of throttled flows before reuse
	net: support compat 64-bit time in {s,g}etsockopt
	openvswitch: Don't swap table in nlattr_set() after OVS_ATTR_NESTED is found
	qmi_wwan: do not steal interfaces from class drivers
	r8169: fix powering up RTL8168h
	sctp: handle two v4 addrs comparison in sctp_inet6_cmp_addr
	sctp: remove sctp_chunk_put from fail_mark err path in sctp_ulpevent_make_rcvmsg
	sctp: use the old asoc when making the cookie-ack chunk in dupcook_d
	tcp_bbr: fix to zero idle_restart only upon S/ACKed data
	tg3: Fix vunmap() BUG_ON() triggered from tg3_free_consistent().
	bonding: do not allow rlb updates to invalid mac
	net/mlx5: Avoid cleaning flow steering table twice during error flow
	bonding: send learning packets for vlans on slave
	tcp: ignore Fast Open on repair mode
	sctp: fix the issue that the cookie-ack with auth can't get processed
	sctp: delay the authentication for the duplicated cookie-echo chunk
	serial: sccnxp: Fix error handling in sccnxp_probe()
	futex: Remove duplicated code and fix undefined behaviour
	xfrm: fix xfrm_do_migrate() with AEAD e.g(AES-GCM)
	lockd: lost rollback of set_grace_period() in lockd_down_net()
	Revert "ARM: dts: imx6qdl-wandboard: Fix audio channel swap"
	l2tp: revert "l2tp: fix missing print session offset info"
	nfp: TX time stamp packets before HW doorbell is rung
	proc: do not access cmdline nor environ from file-backed areas
	futex: futex_wake_op, fix sign_extend32 sign bits
	kernel/exit.c: avoid undefined behaviour when calling wait4()
	Linux 4.9.101

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents e14d1a35 6ba89b52

Makefile

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

VERSION = 4

PATCHLEVEL = 9

PATCHLEVEL = 9

SUBLEVEL = 100

SUBLEVEL = 101

EXTRAVERSION =

EXTRAVERSION =

NAME = Roaring Lionus

NAME = Roaring Lionus

arch/alpha/include/asm/futex.h

+5 −21
Original line number Original line Diff line number Diff line
@@ -29,18 +29,10 @@ 
	:	"r" (uaddr), "r"(oparg)				\

	:	"r" (uaddr), "r"(oparg)				\

	:	"memory")

	:	"memory")





static inline int futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)

static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,

		u32 __user *uaddr)

{

{

	int op = (encoded_op >> 28) & 7;

	int cmp = (encoded_op >> 24) & 15;

	int oparg = (encoded_op << 8) >> 20;

	int cmparg = (encoded_op << 20) >> 20;

	int oldval = 0, ret;

	int oldval = 0, ret;

	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))

		oparg = 1 << oparg;



	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))

		return -EFAULT;





	pagefault_disable();

	pagefault_disable();
@@ -66,17 +58,9 @@ static inline int futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) 




	pagefault_enable();

	pagefault_enable();





	if (!ret) {

	if (!ret)

		switch (cmp) {

		*oval = oldval;

		case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break;



		case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;

		case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break;

		case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break;

		case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break;

		case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break;

		default: ret = -ENOSYS;

		}

	}

	return ret;

	return ret;

}

}

arch/arc/include/asm/futex.h

+5 −35
Original line number Original line Diff line number Diff line
@@ -73,20 +73,11 @@ 




#endif

#endif





static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)

static inline int arch_futex_atomic_op_inuser(int op, int oparg, int *oval,

		u32 __user *uaddr)

{

{

	int op = (encoded_op >> 28) & 7;

	int cmp = (encoded_op >> 24) & 15;

	int oparg = (encoded_op << 8) >> 20;

	int cmparg = (encoded_op << 20) >> 20;

	int oldval = 0, ret;

	int oldval = 0, ret;





	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))

		oparg = 1 << oparg;



	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))

		return -EFAULT;



#ifndef CONFIG_ARC_HAS_LLSC

#ifndef CONFIG_ARC_HAS_LLSC

	preempt_disable();	/* to guarantee atomic r-m-w of futex op */

	preempt_disable();	/* to guarantee atomic r-m-w of futex op */

#endif

#endif
@@ -118,30 +109,9 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr) 
	preempt_enable();

	preempt_enable();

#endif

#endif





	if (!ret) {

	if (!ret)

		switch (cmp) {

		*oval = oldval;

		case FUTEX_OP_CMP_EQ:



			ret = (oldval == cmparg);

			break;

		case FUTEX_OP_CMP_NE:

			ret = (oldval != cmparg);

			break;

		case FUTEX_OP_CMP_LT:

			ret = (oldval < cmparg);

			break;

		case FUTEX_OP_CMP_GE:

			ret = (oldval >= cmparg);

			break;

		case FUTEX_OP_CMP_LE:

			ret = (oldval <= cmparg);

			break;

		case FUTEX_OP_CMP_GT:

			ret = (oldval > cmparg);

			break;

		default:

			ret = -ENOSYS;

		}

	}

	return ret;

	return ret;

}

}

arch/arm/boot/dts/imx6qdl-wandboard.dtsi

+0 −1
Original line number Original line Diff line number Diff line
@@ -88,7 +88,6 @@ 
		clocks = <&clks IMX6QDL_CLK_CKO>;

		clocks = <&clks IMX6QDL_CLK_CKO>;

		VDDA-supply = <&reg_2p5v>;

		VDDA-supply = <&reg_2p5v>;

		VDDIO-supply = <&reg_3p3v>;

		VDDIO-supply = <&reg_3p3v>;

		lrclk-strength = <3>;

	};

	};

};

};

arch/arm/include/asm/futex.h

+4 −22
Original line number Original line Diff line number Diff line
@@ -128,20 +128,10 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, 
#endif /* !SMP */

#endif /* !SMP */





static inline int

static inline int

futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)

arch_futex_atomic_op_inuser(int op, int oparg, int *oval, u32 __user *uaddr)

{

{

	int op = (encoded_op >> 28) & 7;

	int cmp = (encoded_op >> 24) & 15;

	int oparg = (encoded_op << 8) >> 20;

	int cmparg = (encoded_op << 20) >> 20;

	int oldval = 0, ret, tmp;

	int oldval = 0, ret, tmp;





	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))

		oparg = 1 << oparg;



	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))

		return -EFAULT;



#ifndef CONFIG_SMP

#ifndef CONFIG_SMP

	preempt_disable();

	preempt_disable();

#endif

#endif
@@ -172,17 +162,9 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) 
	preempt_enable();

	preempt_enable();

#endif

#endif





	if (!ret) {

	if (!ret)

		switch (cmp) {

		*oval = oldval;

		case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break;



		case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;

		case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break;

		case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break;

		case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break;

		case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break;

		default: ret = -ENOSYS;

		}

	}

	return ret;

	return ret;

}

}