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

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

Merge 3.18.63 into android-3.18 



Changes in 3.18.63
	disable new gcc-7.1.1 warnings for now
	kvm: x86: memset whole irq_eoi
	x86/rtc: Remove duplicate const specifier
	ir-core: fix gcc-7 warning on bool arithmetic
	CIFS: Fix handle_cancelled_mid callback initialization
	ath9k: fix tx99 use after free
	ath9k: fix tx99 bus error
	NFC: fix broken device allocation
	nfc: Ensure presence of required attributes in the activate_target handler
	nfc: Fix the sockaddr length sanitization in llcp_sock_connect
	include/stddef.h: Move offsetofend() from vfio.h to a generic kernel header
	stddef.h: move offsetofend inside #ifndef/#endif guard, neaten
	NFC: Add sockaddr length checks before accessing sa_family in bind handlers
	Bluetooth: use constant time memory comparison for secret values
	ASoC: compress: Derive substream from stream based on direction
	PM / Domains: Fix unsafe iteration over modified list of device links
	PM / Domains: Fix unsafe iteration over modified list of domain providers
	scsi: ses: do not add a device to an enclosure if enclosure_add_links() fails.
	powerpc/64: Fix atomic64_inc_not_zero() to return an int
	powerpc: Fix emulation of mcrf in emulate_step()
	powerpc: Fix emulation of mfocrf in emulate_step()
	powerpc/asm: Mark cr0 as clobbered in mftb()
	af_key: Fix sadb_x_ipsecrequest parsing
	PCI/PM: Restore the status of PCI devices across hibernation
	xhci: fix 20000ms port resume timeout
	xhci: Fix NULL pointer dereference when cleaning up streams for removed host
	usb: storage: return on error to avoid a null pointer dereference
	USB: cdc-acm: add device-id for quirky printer
	usb: renesas_usbhs: fix usbhsc_resume() for !USBHSF_RUNTIME_PWCTRL
	md: don't use flush_signals in userspace processes
	Raid5 should update rdev->sectors after reshape
	s390/syscalls: Fix out of bounds arguments access
	drm/radeon/ci: disable mclk switching for high refresh rates (v2)
	f2fs: Don't clear SGID when inheriting ACLs
	vfio: Fix group release deadlock
	vfio: New external user group/file match
	MIPS: Fix mips_atomic_set() retry condition
	MIPS: Fix mips_atomic_set() with EVA
	MIPS: Negate error syscall return in trace
	x86/acpi: Prevent out of bound access caused by broken ACPI tables
	MIPS: Save static registers before sysmips
	MIPS: Actually decode JALX in `__compute_return_epc_for_insn'
	MIPS: Fix unaligned PC interpretation in `compute_return_epc'
	MIPS: math-emu: Prevent wrong ISA mode instruction emulation
	Input: i8042 - fix crash at boot time
	NFS: only invalidate dentrys that are clearly invalid.
	udf: Fix deadlock between writeback and udf_setsize()
	target: Fix COMPARE_AND_WRITE caw_sem leak during se_cmd quiesce
	perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target
	Revert "perf/core: Drop kernel samples even though :u is specified"
	staging: rtl8188eu: add TL-WN722N v2 support
	drm/mst: Fix error handling during MST sideband message reception
	drm/mst: Avoid dereferencing a NULL mstb in drm_dp_mst_handle_up_req()
	drm/mst: Avoid processing partially received up/down message transactions
	KVM: PPC: Book3S HV: Context-switch EBB registers properly
	of: device: Export of_device_{get_modalias, uvent_modalias} to modules
	spmi: Include OF based modalias in device uevent
	tracing: Fix kmemleak in instance_rmdir
	alarmtimer: don't rate limit one-shot timers
	MIPS: Send SIGILL for BPOSGE32 in `__compute_return_epc_for_insn'
	Linux 3.18.63

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 959ab7b4 8c13fcce

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 62

SUBLEVEL = 63

EXTRAVERSION =

NAME = Diseased Newt
@@ -612,6 +612,9 @@ include $(srctree)/arch/$(SRCARCH)/Makefile 


KBUILD_CFLAGS	+= $(call cc-option,-fno-delete-null-pointer-checks,)

KBUILD_CFLAGS	+= $(call cc-disable-warning,frame-address,)

KBUILD_CFLAGS	+= $(call cc-disable-warning, format-truncation)

KBUILD_CFLAGS	+= $(call cc-disable-warning, format-overflow)

KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)

KBUILD_CFLAGS	+= $(call cc-option,-fno-PIE)

KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)

arch/mips/include/asm/branch.h

+1 −4
Original line number Diff line number Diff line
@@ -74,10 +74,7 @@ static inline int compute_return_epc(struct pt_regs *regs) 
			return __microMIPS_compute_return_epc(regs);

		if (cpu_has_mips16)

			return __MIPS16e_compute_return_epc(regs);

		return regs->cp0_epc;

	}



	if (!delay_slot(regs)) {

	} else if (!delay_slot(regs)) {

		regs->cp0_epc += 4;

		return 0;

	}

arch/mips/kernel/branch.c

+5 −3
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ int __MIPS16e_compute_return_epc(struct pt_regs *regs) 
 *

 * @regs:	Pointer to pt_regs

 * @insn:	branch instruction to decode

 * @returns:	-EFAULT on error and forces SIGBUS, and on success

 * @returns:	-EFAULT on error and forces SIGILL, and on success

 *		returns 0 or BRANCH_LIKELY_TAKEN as appropriate after

 *		evaluating the branch.

 */
@@ -493,6 +493,7 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 
	/*

	 * These are unconditional and in j_format.

	 */

	case jalx_op:

	case jal_op:

		regs->regs[31] = regs->cp0_epc + 8;

	case j_op:
@@ -632,8 +633,9 @@ int __compute_return_epc_for_insn(struct pt_regs *regs, 
	return ret;



sigill:

	printk("%s: DSP branch but not DSP ASE - sending SIGBUS.\n", current->comm);

	force_sig(SIGBUS, current);

	pr_info("%s: DSP branch but not DSP ASE - sending SIGILL.\n",

		current->comm);

	force_sig(SIGILL, current);

	return -EFAULT;

}

EXPORT_SYMBOL_GPL(__compute_return_epc_for_insn);

arch/mips/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -802,7 +802,7 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs) 
	audit_syscall_exit(regs);



	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))

		trace_sys_exit(regs, regs->regs[2]);

		trace_sys_exit(regs, regs_return_value(regs));



	if (test_thread_flag(TIF_SYSCALL_TRACE))

		tracehook_report_syscall_exit(regs, 0);

arch/mips/kernel/scall32-o32.S

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ EXPORT(sys_call_table) 
	PTR	sys_writev

	PTR	sys_cacheflush

	PTR	sys_cachectl

	PTR	sys_sysmips

	PTR	__sys_sysmips

	PTR	sys_ni_syscall			/* 4150 */

	PTR	sys_getsid

	PTR	sys_fdatasync