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

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

Merge 4.19.18 into android-4.19 



Changes in 4.19.18
	ipv6: Consider sk_bound_dev_if when binding a socket to a v4 mapped address
	mlxsw: spectrum: Disable lag port TX before removing it
	mlxsw: spectrum_switchdev: Set PVID correctly during VLAN deletion
	net: dsa: mv88x6xxx: mv88e6390 errata
	net, skbuff: do not prefer skb allocation fails early
	qmi_wwan: add MTU default to qmap network interface
	r8169: Add support for new Realtek Ethernet
	ipv6: Take rcu_read_lock in __inet6_bind for mapped addresses
	net: clear skb->tstamp in bridge forwarding path
	netfilter: ipset: Allow matching on destination MAC address for mac and ipmac sets
	gpio: pl061: Move irq_chip definition inside struct pl061
	drm/amd/display: Guard against null stream_state in set_crc_source
	drm/amdkfd: fix interrupt spin lock
	ixgbe: allow IPsec Tx offload in VEPA mode
	platform/x86: asus-wmi: Tell the EC the OS will handle the display off hotkey
	e1000e: allow non-monotonic SYSTIM readings
	usb: typec: tcpm: Do not disconnect link for self powered devices
	selftests/bpf: enable (uncomment) all tests in test_libbpf.sh
	of: overlay: add missing of_node_put() after add new node to changeset
	writeback: don't decrement wb->refcnt if !wb->bdi
	serial: set suppress_bind_attrs flag only if builtin
	bpf: Allow narrow loads with offset > 0
	ALSA: oxfw: add support for APOGEE duet FireWire
	x86/mce: Fix -Wmissing-prototypes warnings
	MIPS: SiByte: Enable swiotlb for SWARM, LittleSur and BigSur
	crypto: ecc - regularize scalar for scalar multiplication
	arm64: perf: set suppress_bind_attrs flag to true
	drm/atomic-helper: Complete fake_commit->flip_done potentially earlier
	clk: meson: meson8b: fix incorrect divider mapping in cpu_scale_table
	samples: bpf: fix: error handling regarding kprobe_events
	usb: gadget: udc: renesas_usb3: add a safety connection way for forced_b_device
	fpga: altera-cvp: fix probing for multiple FPGAs on the bus
	selinux: always allow mounting submounts
	ASoC: pcm3168a: Don't disable pcm3168a when CONFIG_PM defined
	scsi: qedi: Check for session online before getting iSCSI TLV data.
	drm/amdgpu: Reorder uvd ring init before uvd resume
	rxe: IB_WR_REG_MR does not capture MR's iova field
	efi/libstub: Disable some warnings for x86{,_64}
	jffs2: Fix use of uninitialized delayed_work, lockdep breakage
	clk: imx: make mux parent strings const
	pstore/ram: Do not treat empty buffers as valid
	media: uvcvideo: Refactor teardown of uvc on USB disconnect
	powerpc/xmon: Fix invocation inside lock region
	powerpc/pseries/cpuidle: Fix preempt warning
	media: firewire: Fix app_info parameter type in avc_ca{,_app}_info
	ASoC: use dma_ops of parent device for acp_audio_dma
	media: venus: core: Set dma maximum segment size
	staging: erofs: fix use-after-free of on-stack `z_erofs_vle_unzip_io'
	net: call sk_dst_reset when set SO_DONTROUTE
	scsi: target: use consistent left-aligned ASCII INQUIRY data
	scsi: target/core: Make sure that target_wait_for_sess_cmds() waits long enough
	selftests: do not macro-expand failed assertion expressions
	arm64: kasan: Increase stack size for KASAN_EXTRA
	clk: imx6q: reset exclusive gates on init
	arm64: Fix minor issues with the dcache_by_line_op macro
	bpf: relax verifier restriction on BPF_MOV | BPF_ALU
	kconfig: fix file name and line number of warn_ignored_character()
	kconfig: fix memory leak when EOF is encountered in quotation
	mmc: atmel-mci: do not assume idle after atmci_request_end
	btrfs: volumes: Make sure there is no overlap of dev extents at mount time
	btrfs: alloc_chunk: fix more DUP stripe size handling
	btrfs: fix use-after-free due to race between replace start and cancel
	btrfs: improve error handling of btrfs_add_link
	tty/serial: do not free trasnmit buffer page under port lock
	perf intel-pt: Fix error with config term "pt=0"
	perf tests ARM: Disable breakpoint tests 32-bit
	perf svghelper: Fix unchecked usage of strncpy()
	perf parse-events: Fix unchecked usage of strncpy()
	perf vendor events intel: Fix Load_Miss_Real_Latency on SKL/SKX
	netfilter: ipt_CLUSTERIP: check MAC address when duplicate config is set
	netfilter: ipt_CLUSTERIP: remove wrong WARN_ON_ONCE in netns exit routine
	netfilter: ipt_CLUSTERIP: fix deadlock in netns exit routine
	x86/topology: Use total_cpus for max logical packages calculation
	dm crypt: use u64 instead of sector_t to store iv_offset
	dm kcopyd: Fix bug causing workqueue stalls
	perf stat: Avoid segfaults caused by negated options
	tools lib subcmd: Don't add the kernel sources to the include path
	dm snapshot: Fix excessive memory usage and workqueue stalls
	perf cs-etm: Correct packets swapping in cs_etm__flush()
	perf tools: Add missing sigqueue() prototype for systems lacking it
	perf tools: Add missing open_memstream() prototype for systems lacking it
	quota: Lock s_umount in exclusive mode for Q_XQUOTA{ON,OFF} quotactls.
	clocksource/drivers/integrator-ap: Add missing of_node_put()
	dm: Check for device sector overflow if CONFIG_LBDAF is not set
	Bluetooth: btusb: Add support for Intel bluetooth device 8087:0029
	ALSA: bebob: fix model-id of unit for Apogee Ensemble
	sysfs: Disable lockdep for driver bind/unbind files
	IB/usnic: Fix potential deadlock
	scsi: mpt3sas: fix memory ordering on 64bit writes
	scsi: smartpqi: correct lun reset issues
	ath10k: fix peer stats null pointer dereference
	scsi: smartpqi: call pqi_free_interrupts() in pqi_shutdown()
	scsi: megaraid: fix out-of-bound array accesses
	iomap: don't search past page end in iomap_is_partially_uptodate
	ocfs2: fix panic due to unrecovered local alloc
	mm/page-writeback.c: don't break integrity writeback on ->writepage() error
	mm/swap: use nr_node_ids for avail_lists in swap_info_struct
	userfaultfd: clear flag if remap event not enabled
	mm, proc: be more verbose about unstable VMA flags in /proc/<pid>/smaps
	iwlwifi: mvm: Send LQ command as async when necessary
	Bluetooth: Fix unnecessary error message for HCI request completion
	ipmi: fix use-after-free of user->release_barrier.rda
	ipmi: msghandler: Fix potential Spectre v1 vulnerabilities
	ipmi: Prevent use-after-free in deliver_response
	ipmi:ssif: Fix handling of multi-part return messages
	ipmi: Don't initialize anything in the core until something uses it
	Linux 4.19.18

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 403c37ff 34ae6572

Documentation/filesystems/proc.txt

+3 −1
Original line number Diff line number Diff line
@@ -499,7 +499,9 @@ manner. The codes are the following: 


Note that there is no guarantee that every flag and associated mnemonic will

be present in all further kernel releases. Things get changed, the flags may

be vanished or the reverse -- new added.

be vanished or the reverse -- new added. Interpretation of their meaning

might change in future as well. So each consumer of these flags has to

follow each specific kernel version for the exact semantic.



The "Name" field will only be present on a mapping that has been named by

userspace, and will show the name passed in by userspace.

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 17

SUBLEVEL = 18

EXTRAVERSION =

NAME = "People's Front"

arch/arm64/include/asm/assembler.h

+18 −12
Original line number Diff line number Diff line
@@ -378,27 +378,33 @@ alternative_endif 
 * 	size:		size of the region

 * 	Corrupts:	kaddr, size, tmp1, tmp2

 */

	.macro __dcache_op_workaround_clean_cache, op, kaddr

alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE

	dc	\op, \kaddr

alternative_else

	dc	civac, \kaddr

alternative_endif

	.endm



	.macro dcache_by_line_op op, domain, kaddr, size, tmp1, tmp2

	dcache_line_size \tmp1, \tmp2

	add	\size, \kaddr, \size

	sub	\tmp2, \tmp1, #1

	bic	\kaddr, \kaddr, \tmp2

9998:

	.if	(\op == cvau || \op == cvac)

alternative_if_not ARM64_WORKAROUND_CLEAN_CACHE

	dc	\op, \kaddr

alternative_else

	dc	civac, \kaddr

alternative_endif

	.elseif	(\op == cvap)

alternative_if ARM64_HAS_DCPOP

	.ifc	\op, cvau

	__dcache_op_workaround_clean_cache \op, \kaddr

	.else

	.ifc	\op, cvac

	__dcache_op_workaround_clean_cache \op, \kaddr

	.else

	.ifc	\op, cvap

	sys	3, c7, c12, 1, \kaddr	// dc cvap

alternative_else

	dc	cvac, \kaddr

alternative_endif

	.else

	dc	\op, \kaddr

	.endif

	.endif

	.endif

	add	\kaddr, \kaddr, \tmp1

	cmp	\kaddr, \size

	b.lo	9998b

arch/arm64/include/asm/memory.h

+6 −1
Original line number Diff line number Diff line
@@ -76,12 +76,17 @@ 
/*

 * KASAN requires 1/8th of the kernel virtual address space for the shadow

 * region. KASAN can bloat the stack significantly, so double the (minimum)

 * stack size when KASAN is in use.

 * stack size when KASAN is in use, and then double it again if KASAN_EXTRA is

 * on.

 */

#ifdef CONFIG_KASAN

#define KASAN_SHADOW_SCALE_SHIFT 3

#define KASAN_SHADOW_SIZE	(UL(1) << (VA_BITS - KASAN_SHADOW_SCALE_SHIFT))

#ifdef CONFIG_KASAN_EXTRA

#define KASAN_THREAD_SHIFT	2

#else

#define KASAN_THREAD_SHIFT	1

#endif /* CONFIG_KASAN_EXTRA */

#else

#define KASAN_SHADOW_SIZE	(0)

#define KASAN_THREAD_SHIFT	0

arch/arm64/kernel/perf_event.c

+1 −0
Original line number Diff line number Diff line
@@ -1274,6 +1274,7 @@ static struct platform_driver armv8_pmu_driver = { 
	.driver		= {

		.name	= ARMV8_PMU_PDEV_NAME,

		.of_match_table = armv8_pmu_of_device_ids,

		.suppress_bind_attrs = true,

	},

	.probe		= armv8_pmu_device_probe,

};