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

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

Merge 3.18.110 into android-3.18 



Changes in 3.18.110
	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/mlx4_en: Verify coalescing parameters are in range
	net_sched: fq: take care of throttled flows before reuse
	net: support compat 64-bit time in {s,g}etsockopt
	r8169: fix powering up RTL8168h
	sctp: use the old asoc when making the cookie-ack chunk in dupcook_d
	tg3: Fix vunmap() BUG_ON() triggered from tg3_free_consistent().
	bonding: do not allow rlb updates to invalid mac
	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
	qmi_wwan: do not steal interfaces from class drivers
	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"
	pipe: cap initial pipe capacity according to pipe-max-size limit
	kernel/exit.c: avoid undefined behaviour when calling wait4()
	usbip: usbip_host: refine probe and disconnect debug msgs to be useful
	usbip: usbip_host: delete device from busid_table after rebind
	usbip: usbip_host: run rebind from exit when module is removed
	usbip: fix error handling in stub_probe()
	usbip: usbip_host: fix NULL-ptr deref and use-after-free errors
	usbip: usbip_host: fix bad unlock balance during stub_probe()
	ALSA: usb: mixer: volume quirk for CM102-A+/102S+
	ALSA: control: fix a redundant-copy issue
	powerpc: Don't preempt_disable() in show_cpuinfo()
	tracing/x86/xen: Remove zero data size trace events trace_xen_mmu_flush_tlb{_all}
	powerpc/powernv: Fix NVRAM sleep in invalid context when crashing
	efi: Avoid potential crashes, fix the 'struct efi_pci_io_protocol_32' definition for mixed mode
	ARM: 8771/1: kprobes: Prohibit kprobes on do_undefinstr
	tick/broadcast: Use for_each_cpu() specially on UP kernels
	ARM: 8772/1: kprobes: Prohibit kprobes on get_user functions
	net: test tailroom before appending to linear skb
	tcp: purge write queue in tcp_connect_init()
	ext2: fix a block leak
	scsi: libsas: defer ata device eh commands to libata
	scsi: sg: allocate with __GFP_ZERO in sg_build_indirect()
	cfg80211: limit wiphy names to 128 bytes
	hfsplus: stop workqueue when fill_super() failed
	x86/kexec: Avoid double free_page() upon do_kexec_load() failure
	Linux 3.18.110

Change-Id: I76d61cc5386a4b3d8d5f292a7a200b5a93b34a8b
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 7b2488b7 b87af3ab

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 109

SUBLEVEL = 110

EXTRAVERSION =

NAME = Diseased Newt

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

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

		VDDA-supply = <&reg_2p5v>;

		VDDIO-supply = <&reg_3p3v>;

		lrclk-strength = <3>;

	};

};

arch/arm/include/asm/assembler.h

+10 −0
Original line number Diff line number Diff line
@@ -495,4 +495,14 @@ THUMB( orr \reg , \reg , #PSR_T_BIT ) 
#endif

	.endm



#ifdef CONFIG_KPROBES

#define _ASM_NOKPROBE(entry)				\

	.pushsection "_kprobe_blacklist", "aw" ;	\

	.balign 4 ;					\

	.long entry;					\

	.popsection

#else

#define _ASM_NOKPROBE(entry)

#endif



#endif /* __ASM_ASSEMBLER_H__ */

arch/arm/kernel/traps.c

+4 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/uaccess.h>

#include <linux/hardirq.h>

#include <linux/kdebug.h>

#include <linux/kprobes.h>

#include <linux/module.h>

#include <linux/kexec.h>

#include <linux/bug.h>
@@ -395,7 +396,8 @@ void unregister_undef_hook(struct undef_hook *hook) 
	raw_spin_unlock_irqrestore(&undef_lock, flags);

}



static int call_undef_hook(struct pt_regs *regs, unsigned int instr)

static nokprobe_inline

int call_undef_hook(struct pt_regs *regs, unsigned int instr)

{

	struct undef_hook *hook;

	unsigned long flags;
@@ -468,6 +470,7 @@ die_sig: 


	arm_notify_die("Oops - undefined instruction", regs, &info, 0, 6);

}

NOKPROBE_SYMBOL(do_undefinstr)



/*

 * Handle FIQ similarly to NMI on x86 systems.

arch/arm/lib/getuser.S

+10 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ ENTRY(__get_user_1) 
	mov	r0, #0

	ret	lr

ENDPROC(__get_user_1)

_ASM_NOKPROBE(__get_user_1)



ENTRY(__get_user_2)

	check_uaccess r0, 2, r1, r2, __get_user_bad
@@ -58,6 +59,7 @@ rb .req r0 
	mov	r0, #0

	ret	lr

ENDPROC(__get_user_2)

_ASM_NOKPROBE(__get_user_2)



ENTRY(__get_user_4)

	check_uaccess r0, 4, r1, r2, __get_user_bad
@@ -65,6 +67,7 @@ ENTRY(__get_user_4) 
	mov	r0, #0

	ret	lr

ENDPROC(__get_user_4)

_ASM_NOKPROBE(__get_user_4)



ENTRY(__get_user_8)

	check_uaccess r0, 8, r1, r2, __get_user_bad
@@ -78,6 +81,7 @@ ENTRY(__get_user_8) 
	mov	r0, #0

	ret	lr

ENDPROC(__get_user_8)

_ASM_NOKPROBE(__get_user_8)



#ifdef __ARMEB__

ENTRY(__get_user_32t_8)
@@ -91,6 +95,7 @@ ENTRY(__get_user_32t_8) 
	mov	r0, #0

	ret	lr

ENDPROC(__get_user_32t_8)

_ASM_NOKPROBE(__get_user_32t_8)



ENTRY(__get_user_64t_1)

	check_uaccess r0, 1, r1, r2, __get_user_bad8
@@ -98,6 +103,7 @@ ENTRY(__get_user_64t_1) 
	mov	r0, #0

	ret	lr

ENDPROC(__get_user_64t_1)

_ASM_NOKPROBE(__get_user_64t_1)



ENTRY(__get_user_64t_2)

	check_uaccess r0, 2, r1, r2, __get_user_bad8
@@ -114,6 +120,7 @@ rb .req r0 
	mov	r0, #0

	ret	lr

ENDPROC(__get_user_64t_2)

_ASM_NOKPROBE(__get_user_64t_2)



ENTRY(__get_user_64t_4)

	check_uaccess r0, 4, r1, r2, __get_user_bad8
@@ -121,6 +128,7 @@ ENTRY(__get_user_64t_4) 
	mov	r0, #0

	ret	lr

ENDPROC(__get_user_64t_4)

_ASM_NOKPROBE(__get_user_64t_4)

#endif



__get_user_bad8:
@@ -131,6 +139,8 @@ __get_user_bad: 
	ret	lr

ENDPROC(__get_user_bad)

ENDPROC(__get_user_bad8)

_ASM_NOKPROBE(__get_user_bad)

_ASM_NOKPROBE(__get_user_bad8)



.pushsection __ex_table, "a"

	.long	1b, __get_user_bad