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

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

Merge 4.14.115 into android-4.14 



Changes in 4.14.115
	kbuild: simplify ld-option implementation
	cifs: do not attempt cifs operation on smb2+ rename error
	tracing: Fix a memory leak by early error exit in trace_pid_write()
	tracing: Fix buffer_ref pipe ops
	zram: pass down the bvec we need to read into in the work struct
	lib/Kconfig.debug: fix build error without CONFIG_BLOCK
	MIPS: scall64-o32: Fix indirect syscall number load
	trace: Fix preempt_enable_no_resched() abuse
	IB/rdmavt: Fix frwr memory registration
	sched/numa: Fix a possible divide-by-zero
	ceph: only use d_name directly when parent is locked
	ceph: ensure d_name stability in ceph_dentry_hash()
	ceph: fix ci->i_head_snapc leak
	nfsd: Don't release the callback slot unless it was actually held
	sunrpc: don't mark uninitialised items as VALID.
	Input: synaptics-rmi4 - write config register values to the right offset
	vfio/type1: Limit DMA mappings per container
	dmaengine: sh: rcar-dmac: With cyclic DMA residue 0 is valid
	ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache
	drm/vc4: Fix memory leak during gpu reset.
	Revert "drm/i915/fbdev: Actually configure untiled displays"
	drm/vc4: Fix compilation error reported by kbuild test bot
	USB: Add new USB LPM helpers
	USB: Consolidate LPM checks to avoid enabling LPM twice
	ext4: fix some error pointer dereferences
	vsock/virtio: fix kernel panic from virtio_transport_reset_no_sock
	tipc: handle the err returned from cmd header function
	slip: make slhc_free() silently accept an error pointer
	intel_th: gth: Fix an off-by-one in output unassigning
	fs/proc/proc_sysctl.c: Fix a NULL pointer dereference
	ipvs: fix warning on unused variable
	binder: fix handling of misaligned binder object
	sched/deadline: Correctly handle active 0-lag timers
	NFS: Forbid setting AF_INET6 to "struct sockaddr_in"->sin_family.
	netfilter: ebtables: CONFIG_COMPAT: drop a bogus WARN_ON
	fm10k: Fix a potential NULL pointer dereference
	tipc: check bearer name with right length in tipc_nl_compat_bearer_enable
	tipc: check link name with right length in tipc_nl_compat_link_set
	dm integrity: change memcmp to strncmp in dm_integrity_ctr
	x86, retpolines: Raise limit for generating indirect calls from switch-case
	x86/retpolines: Disable switch jump tables when retpolines are enabled
	mm: Fix warning in insert_pfn()
	Revert "block/loop: Use global lock for ioctl() operation."
	ipv4: add sanity checks in ipv4_link_failure()
	mlxsw: spectrum: Fix autoneg status in ethtool
	net/mlx5e: ethtool, Remove unsupported SFP EEPROM high pages query
	net: rds: exchange of 8K and 1M pool
	net: stmmac: move stmmac_check_ether_addr() to driver probe
	stmmac: pci: Adjust IOT2000 matching
	team: fix possible recursive locking when add slaves
	net/rose: Convert timers to use timer_setup()
	net/rose: fix unbound loop in rose_loopback_timer()
	ipv4: set the tcp_min_rtt_wlen range from 0 to one day
	powerpc/fsl: Add FSL_PPC_BOOK3E as supported arch for nospectre_v2 boot arg
	Documentation: Add nospectre_v1 parameter
	Linux 4.14.115

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents c680586c 1c046f37

Documentation/admin-guide/kernel-parameters.txt

+5 −1
Original line number Original line Diff line number Diff line
@@ -2680,7 +2680,11 @@ 
			nosmt=force: Force disable SMT, cannot be undone

			nosmt=force: Force disable SMT, cannot be undone

				     via the sysfs control file.

				     via the sysfs control file.





	nospectre_v2	[X86] Disable all mitigations for the Spectre variant 2

	nospectre_v1	[PPC] Disable mitigations for Spectre Variant 1 (bounds

			check bypass). With this option data leaks are possible

			in the system.



	nospectre_v2	[X86,PPC_FSL_BOOK3E] Disable all mitigations for the Spectre variant 2

			(indirect branch prediction) vulnerability. System may

			(indirect branch prediction) vulnerability. System may

			allow data leaks with this option, which is equivalent

			allow data leaks with this option, which is equivalent

			to spectre_v2=off.

			to spectre_v2=off.

Documentation/networking/ip-sysctl.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -402,6 +402,7 @@ tcp_min_rtt_wlen - INTEGER 
	minimum RTT when it is moved to a longer path (e.g., due to traffic

	minimum RTT when it is moved to a longer path (e.g., due to traffic

	engineering). A longer window makes the filter more resistant to RTT

	engineering). A longer window makes the filter more resistant to RTT

	inflations such as transient congestion. The unit is seconds.

	inflations such as transient congestion. The unit is seconds.

	Possible values: 0 - 86400 (1 day)

	Default: 300

	Default: 300





tcp_moderate_rcvbuf - BOOLEAN

tcp_moderate_rcvbuf - BOOLEAN

Makefile

+1 −1
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# SPDX-License-Identifier: GPL-2.0

VERSION = 4

VERSION = 4

PATCHLEVEL = 14

PATCHLEVEL = 14

SUBLEVEL = 114

SUBLEVEL = 115

EXTRAVERSION =

EXTRAVERSION =

NAME = Petit Gorille

NAME = Petit Gorille

arch/arm/boot/compressed/head.S

+15 −1
Original line number Original line Diff line number Diff line
@@ -1395,7 +1395,21 @@ ENTRY(efi_stub_entry) 




		@ Preserve return value of efi_entry() in r4

		@ Preserve return value of efi_entry() in r4

		mov	r4, r0

		mov	r4, r0

		bl	cache_clean_flush



		@ our cache maintenance code relies on CP15 barrier instructions

		@ but since we arrived here with the MMU and caches configured

		@ by UEFI, we must check that the CP15BEN bit is set in SCTLR.

		@ Note that this bit is RAO/WI on v6 and earlier, so the ISB in

		@ the enable path will be executed on v7+ only.

		mrc	p15, 0, r1, c1, c0, 0	@ read SCTLR

		tst	r1, #(1 << 5)		@ CP15BEN bit set?

		bne	0f

		orr	r1, r1, #(1 << 5)	@ CP15 barrier instructions

		mcr	p15, 0, r1, c1, c0, 0	@ write SCTLR

 ARM(		.inst	0xf57ff06f		@ v7+ isb	)

 THUMB(		isb						)



0:		bl	cache_clean_flush

		bl	cache_off

		bl	cache_off





		@ Set parameters for booting zImage according to boot protocol

		@ Set parameters for booting zImage according to boot protocol

arch/mips/kernel/scall64-o32.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -125,7 +125,7 @@ trace_a_syscall: 
	subu	t1, v0,  __NR_O32_Linux

	subu	t1, v0,  __NR_O32_Linux

	move	a1, v0

	move	a1, v0

	bnez	t1, 1f /* __NR_syscall at offset 0 */

	bnez	t1, 1f /* __NR_syscall at offset 0 */

	lw	a1, PT_R4(sp) /* Arg1 for __NR_syscall case */

	ld	a1, PT_R4(sp) /* Arg1 for __NR_syscall case */

	.set	pop

	.set	pop





1:	jal	syscall_trace_enter

1:	jal	syscall_trace_enter