Commit aa07ecba authored May 25, 2019 by Greg Kroah-Hartman

Merge 4.19.46 into android-4.19



Changes in 4.19.46
	ipv6: fix src addr routing with the exception table
	ipv6: prevent possible fib6 leaks
	net: Always descend into dsa/
	net: avoid weird emergency message
	net/mlx4_core: Change the error print to info print
	net: test nouarg before dereferencing zerocopy pointers
	net: usb: qmi_wwan: add Telit 0x1260 and 0x1261 compositions
	nfp: flower: add rcu locks when accessing netdev for tunnels
	ppp: deflate: Fix possible crash in deflate_init
	rtnetlink: always put IFLA_LINK for links with a link-netnsid
	tipc: switch order of device registration to fix a crash
	vsock/virtio: free packets during the socket release
	tipc: fix modprobe tipc failed after switch order of device registration
	vsock/virtio: Initialize core virtio vsock before registering the driver
	net/mlx5: Imply MLXFW in mlx5_core
	net/mlx5e: Fix ethtool rxfh commands when CONFIG_MLX5_EN_RXNFC is disabled
	parisc: Export running_on_qemu symbol for modules
	parisc: Skip registering LED when running in QEMU
	parisc: Use PA_ASM_LEVEL in boot code
	parisc: Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code
	stm class: Fix channel free in stm output free path
	stm class: Fix channel bitmap on 32-bit systems
	brd: re-enable __GFP_HIGHMEM in brd_insert_page()
	proc: prevent changes to overridden credentials
	Revert "MD: fix lock contention for flush bios"
	md: batch flush requests.
	md: add mddev->pers to avoid potential NULL pointer dereference
	dcache: sort the freeing-without-RCU-delay mess for good.
	intel_th: msu: Fix single mode with IOMMU
	p54: drop device reference count if fails to enable device
	of: fix clang -Wunsequenced for be32_to_cpu()
	cifs: fix strcat buffer overflow and reduce raciness in smb21_set_oplock_level()
	phy: ti-pipe3: fix missing bit-wise or operator when assigning val
	media: ov6650: Fix sensor possibly not detected on probe
	media: imx: csi: Allow unknown nearest upstream entities
	media: imx: Clear fwnode link struct for each endpoint iteration
	NFS4: Fix v4.0 client state corruption when mount
	PNFS fallback to MDS if no deviceid found
	clk: hi3660: Mark clk_gate_ufs_subsys as critical
	clk: tegra: Fix PLLM programming on Tegra124+ when PMC overrides divider
	clk: mediatek: Disable tuner_en before change PLL rate
	clk: rockchip: fix wrong clock definitions for rk3328
	udlfb: delete the unused parameter for dlfb_handle_damage
	udlfb: fix sleeping inside spinlock
	udlfb: introduce a rendering mutex
	fuse: fix writepages on 32bit
	fuse: honor RLIMIT_FSIZE in fuse_file_fallocate
	ovl: fix missing upper fs freeze protection on copy up for ioctl
	iommu/tegra-smmu: Fix invalid ASID bits on Tegra30/114
	ceph: flush dirty inodes before proceeding with remount
	x86_64: Add gap to int3 to allow for call emulation
	x86_64: Allow breakpoints to emulate call instructions
	ftrace/x86_64: Emulate call function while updating in breakpoint handler
	tracing: Fix partial reading of trace event's id file
	memory: tegra: Fix integer overflow on tick value calculation
	perf intel-pt: Fix instructions sampling rate
	perf intel-pt: Fix improved sample timestamp
	perf intel-pt: Fix sample timestamp wrt non-taken branches
	MIPS: perf: Fix build with CONFIG_CPU_BMIPS5000 enabled
	objtool: Allow AR to be overridden with HOSTAR
	fbdev/efifb: Ignore framebuffer memmap entries that lack any memory types
	fbdev: sm712fb: fix brightness control on reboot, don't set SR30
	fbdev: sm712fb: fix VRAM detection, don't set SR70/71/74/75
	fbdev: sm712fb: fix white screen of death on reboot, don't set CR3B-CR3F
	fbdev: sm712fb: fix boot screen glitch when sm712fb replaces VGA
	fbdev: sm712fb: fix crashes during framebuffer writes by correctly mapping VRAM
	fbdev: sm712fb: fix support for 1024x768-16 mode
	fbdev: sm712fb: use 1024x768 by default on non-MIPS, fix garbled display
	fbdev: sm712fb: fix crashes and garbled display during DPMS modesetting
	PCI: Mark AMD Stoney Radeon R7 GPU ATS as broken
	PCI: Mark Atheros AR9462 to avoid bus reset
	PCI: Init PCIe feature bits for managed host bridge alloc
	PCI/AER: Change pci_aer_init() stub to return void
	PCI: rcar: Add the initialization of PCIe link in resume_noirq()
	PCI: Factor out pcie_retrain_link() function
	PCI: Work around Pericom PCIe-to-PCI bridge Retrain Link erratum
	dm cache metadata: Fix loading discard bitset
	dm zoned: Fix zone report handling
	dm delay: fix a crash when invalid device is specified
	dm integrity: correctly calculate the size of metadata area
	dm mpath: always free attached_handler_name in parse_path()
	fuse: Add FOPEN_STREAM to use stream_open()
	xfrm: policy: Fix out-of-bound array accesses in __xfrm_policy_unlink
	xfrm6_tunnel: Fix potential panic when unloading xfrm6_tunnel module
	vti4: ipip tunnel deregistration fixes.
	xfrm: clean up xfrm protocol checks
	esp4: add length check for UDP encapsulation
	xfrm: Honor original L3 slave device in xfrmi policy lookup
	xfrm4: Fix uninitialized memory read in _decode_session4
	clk: sunxi-ng: nkmp: Avoid GENMASK(-1, 0)
	power: supply: cpcap-battery: Fix division by zero
	securityfs: fix use-after-free on symlink traversal
	apparmorfs: fix use-after-free on symlink traversal
	PCI: Fix issue with "pci=disable_acs_redir" parameter being ignored
	x86: kvm: hyper-v: deal with buggy TLB flush requests from WS2012
	mac80211: Fix kernel panic due to use of txq after free
	net: ieee802154: fix missing checks for regmap_update_bits
	KVM: arm/arm64: Ensure vcpu target is unset on reset failure
	power: supply: sysfs: prevent endless uevent loop with CONFIG_POWER_SUPPLY_DEBUG
	bpf: Fix preempt_enable_no_resched() abuse
	qmi_wwan: new Wistron, ZTE and D-Link devices
	iwlwifi: mvm: check for length correctness in iwl_mvm_create_skb()
	sched/cpufreq: Fix kobject memleak
	x86/mm/mem_encrypt: Disable all instrumentation for early SME setup
	ufs: fix braino in ufs_get_inode_gid() for solaris UFS flavour
	perf bench numa: Add define for RUSAGE_THREAD if not present
	perf/x86/intel: Fix race in intel_pmu_disable_event()
	Revert "Don't jump to compute_result state from check_result state"
	md/raid: raid5 preserve the writeback action after the parity check
	driver core: Postpone DMA tear-down until after devres release for probe failure
	Revert "selftests/bpf: skip verifier tests for unsupported program types"
	bpf: relax inode permission check for retrieving bpf program
	bpf: add map_lookup_elem_sys_only for lookups from syscall side
	bpf, lru: avoid messing with eviction heuristics upon syscall lookup
	fbdev: sm712fb: fix memory frequency by avoiding a switch/case fallthrough
	Linux 4.19.46

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parents cc9548cc 8b2fc005

Documentation/filesystems/porting

+5 −0

Original line number	Diff line number	Diff line
		@@ -622,3 +622,8 @@ in your dentry operations instead.
		alloc_file_clone(file, flags, ops) does not affect any caller's references.
		On success you get a new struct file sharing the mount/dentry with the
		original, on failure - ERR_PTR().
		--
		[mandatory]
		DCACHE_RCUACCESS is gone; having an RCU delay on dentry freeing is the
		default. DCACHE_NORCU opts out, and only d_alloc_pseudo() has any
		business doing so.

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 4
		PATCHLEVEL = 19
		SUBLEVEL = 45
		SUBLEVEL = 46
		EXTRAVERSION =
		NAME = "People's Front"

arch/mips/kernel/perf_event_mipsxx.c

+3 −18

Original line number	Diff line number	Diff line
		@@ -64,17 +64,11 @@ struct mips_perf_event {
		#define CNTR_EVEN 0x55555555
		#define CNTR_ODD 0xaaaaaaaa
		#define CNTR_ALL 0xffffffff
		#ifdef CONFIG_MIPS_MT_SMP
		enum {
		T = 0,
		V = 1,
		P = 2,
		} range;
		#else
		#define T
		#define V
		#define P
		#endif
		};

		static struct mips_perf_event raw_event;
		@@ -325,9 +319,7 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx)
		{
		struct perf_event *event = container_of(evt, struct perf_event, hw);
		struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
		#ifdef CONFIG_MIPS_MT_SMP
		unsigned int range = evt->event_base >> 24;
		#endif /* CONFIG_MIPS_MT_SMP */

		WARN_ON(idx < 0 \|\| idx >= mipspmu.num_counters);

		@@ -336,21 +328,15 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx)
		/* Make sure interrupt enabled. */
		MIPS_PERFCTRL_IE;

		#ifdef CONFIG_CPU_BMIPS5000
		{
		if (IS_ENABLED(CONFIG_CPU_BMIPS5000)) {
		/* enable the counter for the calling thread */
		cpuc->saved_ctrl[idx] \|=
		(1 << (12 + vpe_id())) \| BRCM_PERFCTRL_TC;
		}
		#else
		#ifdef CONFIG_MIPS_MT_SMP
		if (range > V) {
		} else if (IS_ENABLED(CONFIG_MIPS_MT_SMP) && range > V) {
		/* The counter is processor wide. Set it up to count all TCs. */
		pr_debug("Enabling perf counter for all TCs\n");
		cpuc->saved_ctrl[idx] \|= M_TC_EN_ALL;
		} else
		#endif /* CONFIG_MIPS_MT_SMP */
		{
		} else {
		unsigned int cpu, ctrl;

		/*
		@@ -365,7 +351,6 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx)
		cpuc->saved_ctrl[idx] \|= ctrl;
		pr_debug("Enabling perf counter for CPU%d\n", cpu);
		}
		#endif /* CONFIG_CPU_BMIPS5000 */
		/*
		* We do not actually let the counter run. Leave it until start().
		*/

arch/parisc/boot/compressed/head.S

+3 −3

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		__HEAD

		ENTRY(startup)
		.level LEVEL
		.level PA_ASM_LEVEL

		#define PSW_W_SM 0x200
		#define PSW_W_BIT 36
		@@ -63,7 +63,7 @@ $bss_loop:
		load32 BOOTADDR(decompress_kernel),%r3

		#ifdef CONFIG_64BIT
		.level LEVEL
		.level PA_ASM_LEVEL
		ssm PSW_W_SM, %r0 /* set W-bit */
		depdi 0, 31, 32, %r3
		#endif
		@@ -72,7 +72,7 @@ $bss_loop:

		startup_continue:
		#ifdef CONFIG_64BIT
		.level LEVEL
		.level PA_ASM_LEVEL
		rsm PSW_W_SM, %r0 /* clear W-bit */
		#endif

arch/parisc/include/asm/assembly.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -61,14 +61,14 @@
		#define LDCW ldcw,co
		#define BL b,l
		# ifdef CONFIG_64BIT
		# define LEVEL 2.0w
		# define PA_ASM_LEVEL 2.0w
		# else
		# define LEVEL 2.0
		# define PA_ASM_LEVEL 2.0
		# endif
		#else
		#define LDCW ldcw
		#define BL bl
		#define LEVEL 1.1
		#define PA_ASM_LEVEL 1.1
		#endif

		#ifdef __ASSEMBLY__