Commit 63b83aed authored Jul 07, 2022 by Greg Kroah-Hartman

Merge 5.4.204 into android11-5.4-lts



Changes in 5.4.204
	ipv6: take care of disable_policy when restoring routes
	nvdimm: Fix badblocks clear off-by-one error
	powerpc/prom_init: Fix kernel config grep
	powerpc/bpf: Fix use of user_pt_regs in uapi
	dm raid: fix accesses beyond end of raid member array
	dm raid: fix KASAN warning in raid5_add_disks
	s390/archrandom: simplify back to earlier design and initialize earlier
	SUNRPC: Fix READ_PLUS crasher
	net: rose: fix UAF bugs caused by timer handler
	net: usb: ax88179_178a: Fix packet receiving
	virtio-net: fix race between ndo_open() and virtio_device_ready()
	selftests/net: pass ipv6_args to udpgso_bench's IPv6 TCP test
	net: tun: unlink NAPI from device on destruction
	net: tun: stop NAPI when detaching queues
	RDMA/qedr: Fix reporting QP timeout attribute
	linux/dim: Fix divide by 0 in RDMA DIM
	usbnet: fix memory allocation in helpers
	net: ipv6: unexport __init-annotated seg6_hmac_net_init()
	caif_virtio: fix race between virtio_device_ready() and ndo_open()
	PM / devfreq: exynos-ppmu: Fix refcount leak in of_get_devfreq_events
	s390: remove unneeded 'select BUILD_BIN2C'
	netfilter: nft_dynset: restore set element counter when failing to update
	net/sched: act_api: Notify user space if any actions were flushed before error
	net: bonding: fix possible NULL deref in rlb code
	net: bonding: fix use-after-free after 802.3ad slave unbind
	nfc: nfcmrvl: Fix irq_of_parse_and_map() return value
	NFC: nxp-nci: Don't issue a zero length i2c_master_read()
	net: tun: avoid disabling NAPI twice
	xen/gntdev: Avoid blocking in unmap_grant_pages()
	hwmon: (ibmaem) don't call platform_device_del() if platform_device_add() fails
	net: dsa: bcm_sf2: force pause link settings
	sit: use min
	ipv6/sit: fix ipip6_tunnel_get_prl return value
	rseq/selftests,x86_64: Add rseq_offset_deref_addv()
	selftests/rseq: remove ARRAY_SIZE define from individual tests
	selftests/rseq: introduce own copy of rseq uapi header
	selftests/rseq: Remove useless assignment to cpu variable
	selftests/rseq: Remove volatile from __rseq_abi
	selftests/rseq: Introduce rseq_get_abi() helper
	selftests/rseq: Introduce thread pointer getters
	selftests/rseq: Uplift rseq selftests for compatibility with glibc-2.35
	selftests/rseq: Fix ppc32: wrong rseq_cs 32-bit field pointer on big endian
	selftests/rseq: Fix ppc32 missing instruction selection "u" and "x" for load/store
	selftests/rseq: Fix ppc32 offsets by using long rather than off_t
	selftests/rseq: Fix warnings about #if checks of undefined tokens
	selftests/rseq: Remove arm/mips asm goto compiler work-around
	selftests/rseq: Fix: work-around asm goto compiler bugs
	selftests/rseq: x86-64: use %fs segment selector for accessing rseq thread area
	selftests/rseq: x86-32: use %gs segment selector for accessing rseq thread area
	selftests/rseq: Change type of rseq_offset to ptrdiff_t
	xen/blkfront: fix leaking data in shared pages
	xen/netfront: fix leaking data in shared pages
	xen/netfront: force data bouncing when backend is untrusted
	xen/blkfront: force data bouncing when backend is untrusted
	xen/arm: Fix race in RB-tree based P2M accounting
	net: usb: qmi_wwan: add Telit 0x1060 composition
	net: usb: qmi_wwan: add Telit 0x1070 composition
	clocksource/drivers/ixp4xx: remove EXPORT_SYMBOL_GPL from ixp4xx_timer_setup()
	Linux 5.4.204

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

parents 15a9d795 49286fbd

Makefile

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		VERSION = 5
		PATCHLEVEL = 4
		SUBLEVEL = 203
		SUBLEVEL = 204
		EXTRAVERSION =
		NAME = Kleptomaniac Octopus

arch/arm/xen/p2m.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -62,11 +62,12 @@ static int xen_add_phys_to_mach_entry(struct xen_p2m_entry *new)

		unsigned long __pfn_to_mfn(unsigned long pfn)
		{
		struct rb_node *n = phys_to_mach.rb_node;
		struct rb_node *n;
		struct xen_p2m_entry *entry;
		unsigned long irqflags;

		read_lock_irqsave(&p2m_lock, irqflags);
		n = phys_to_mach.rb_node;
		while (n) {
		entry = rb_entry(n, struct xen_p2m_entry, rbnode_phys);
		if (entry->pfn <= pfn &&
		@@ -153,10 +154,11 @@ bool __set_phys_to_machine_multi(unsigned long pfn,
		int rc;
		unsigned long irqflags;
		struct xen_p2m_entry *p2m_entry;
		struct rb_node *n = phys_to_mach.rb_node;
		struct rb_node *n;

		if (mfn == INVALID_P2M_ENTRY) {
		write_lock_irqsave(&p2m_lock, irqflags);
		n = phys_to_mach.rb_node;
		while (n) {
		p2m_entry = rb_entry(n, struct xen_p2m_entry, rbnode_phys);
		if (p2m_entry->pfn <= pfn &&

arch/powerpc/include/asm/bpf_perf_event.h

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 */
		#ifndef _ASM_POWERPC_BPF_PERF_EVENT_H
		#define _ASM_POWERPC_BPF_PERF_EVENT_H

		#include <asm/ptrace.h>

		typedef struct user_pt_regs bpf_user_pt_regs_t;

		#endif /* _ASM_POWERPC_BPF_PERF_EVENT_H */

arch/powerpc/include/uapi/asm/bpf_perf_event.h

deleted100644 → 0

+0 −9

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
		#ifndef _UAPI__ASM_BPF_PERF_EVENT_H__
		#define _UAPI__ASM_BPF_PERF_EVENT_H__

		#include <asm/ptrace.h>

		typedef struct user_pt_regs bpf_user_pt_regs_t;

		#endif /* _UAPI__ASM_BPF_PERF_EVENT_H__ */

arch/powerpc/kernel/prom_init_check.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		# If you really need to reference something from prom_init.o add
		# it to the list below:

		grep "^CONFIG_KASAN=y$" .config >/dev/null
		grep "^CONFIG_KASAN=y$" ${KCONFIG_CONFIG} >/dev/null
		if [ $? -eq 0 ]
		then
		MEM_FUNCS="__memcpy __memset"