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

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

Merge 3.18.95 into android-3.18 



Changes in 3.18.95
	vhost_net: stop device during reset owner
	ip6mr: fix stale iterator
	net: igmp: add a missing rcu locking section
	qlcnic: fix deadlock bug
	r8169: fix RTL8168EP take too long to complete driver initialization.
	tcp: release sk_frag.page in tcp_disconnect
	ARM: exynos_defconfig: Enable options to mount a rootfs via NFS
	ARM: exynos_defconfig: Enable NFSv4 client
	KEYS: encrypted: fix buffer overread in valid_master_desc()
	ipv4: Map neigh lookup keys in __ipv4_neigh_lookup_noref()
	cifs: Fix missing put_xid in cifs_file_strict_mmap
	cifs: Fix autonegotiate security settings mismatch
	CIFS: zero sensitive data when freeing
	posix-timer: Properly check sigevent->sigev_notify
	usbip: fix stub_rx: get_pipe() to validate endpoint number
	usbip: fix stub_rx: harden CMD_SUBMIT path to handle malicious input
	usbip: prevent vhci_hcd driver from leaking a socket pointer address
	usbip: Fix potential format overflow in userspace tools
	usb: usbip: Fix possible deadlocks reported by lockdep
	usbip: vhci-hcd: Add USB3 SuperSpeed support
	usbip: prevent leaking socket pointer address in messages
	usbip: stub: stop printing kernel pointer addresses in messages
	usbip: vhci: stop printing kernel pointer addresses in messages
	dccp: CVE-2017-8824: use-after-free in DCCP code
	media: dvb-usb-v2: lmedm04: Improve logic checking of warm start
	media: dvb-usb-v2: lmedm04: move ts2020 attach to dm04_lme2510_tuner
	mtd: nand: Fix nand_do_read_oob() return value
	NFS: Add a cond_resched() to nfs_commit_release_pages()
	NFS: commit direct writes even if they fail partially
	kernfs: fix regression in kernfs_fop_write caused by wrong type
	crypto: hash - introduce crypto_hash_alg_has_setkey()
	crypto: cryptd - pass through absence of ->setkey()
	crypto: caam - fix endless loop when DECO acquire fails
	media: cxusb, dib0700: ignore XC2028_I2C_FLUSH
	kernel/async.c: revert "async: simplify lowest_in_progress()"
	signal/openrisc: Fix do_unaligned_access to send the proper signal
	signal/sh: Ensure si_signo is initialized in do_divide_error
	alpha: fix crash if pthread_create races with signal delivery
	alpha: fix reboot on Avanti platform
	xtensa: fix futex_atomic_cmpxchg_inatomic
	EDAC, octeon: Fix an uninitialized variable warning
	pktcdvd: Fix pkt_setup_dev() error path
	ACPI: sbshc: remove raw pointer from printk() message
	mn10300/misalignment: Use SIGSEGV SEGV_MAPERR to report a failed user copy
	Linux 3.18.95

Change-Id: Ia1a60494c3d3994a3f0a9ce2ee54173cd9f41568
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents c47cf417 0c946219

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 94

SUBLEVEL = 95

EXTRAVERSION =

NAME = Diseased Newt

arch/alpha/kernel/pci_impl.h

+2 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ struct pci_iommu_arena 
};



#if defined(CONFIG_ALPHA_SRM) && \

    (defined(CONFIG_ALPHA_CIA) || defined(CONFIG_ALPHA_LCA))

    (defined(CONFIG_ALPHA_CIA) || defined(CONFIG_ALPHA_LCA) || \

     defined(CONFIG_ALPHA_AVANTI))

# define NEED_SRM_SAVE_RESTORE

#else

# undef NEED_SRM_SAVE_RESTORE

arch/alpha/kernel/process.c

+2 −1
Original line number Diff line number Diff line
@@ -274,12 +274,13 @@ copy_thread(unsigned long clone_flags, unsigned long usp, 
	   application calling fork.  */

	if (clone_flags & CLONE_SETTLS)

		childti->pcb.unique = regs->r20;

	else

		regs->r20 = 0;	/* OSF/1 has some strange fork() semantics.  */

	childti->pcb.usp = usp ?: rdusp();

	*childregs = *regs;

	childregs->r0 = 0;

	childregs->r19 = 0;

	childregs->r20 = 1;	/* OSF/1 has some strange fork() semantics.  */

	regs->r20 = 0;

	stack = ((struct switch_stack *) regs) - 1;

	*childstack = *stack;

	childstack->r26 = (unsigned long) ret_from_fork;

arch/arm/configs/exynos_defconfig

+7 −0
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ CONFIG_PACKET=y 
CONFIG_UNIX=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

CONFIG_RFKILL_REGULATOR=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y
@@ -170,6 +174,9 @@ CONFIG_TMPFS=y 
CONFIG_TMPFS_POSIX_ACL=y

CONFIG_CRAMFS=y

CONFIG_ROMFS_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

arch/mn10300/mm/misalignment.c

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ transfer_failed: 


	info.si_signo	= SIGSEGV;

	info.si_errno	= 0;

	info.si_code	= 0;

	info.si_code	= SEGV_MAPERR;

	info.si_addr	= (void *) regs->pc;

	force_sig_info(SIGSEGV, &info, current);

	return;