Commit fa6db427 authored Oct 20, 2021 by Greg Kroah-Hartman

Merge 5.4.155 into android11-5.4-lts



Changes in 5.4.155
	ovl: simplify file splice
	ALSA: usb-audio: Add quirk for VF0770
	ALSA: seq: Fix a potential UAF by wrong private_free call order
	ALSA: hda/realtek: Complete partial device name to avoid ambiguity
	ALSA: hda/realtek: Add quirk for Clevo X170KM-G
	ALSA: hda/realtek - ALC236 headset MIC recording issue
	ALSA: hda/realtek: Fix the mic type detection issue for ASUS G551JW
	nds32/ftrace: Fix Error: invalid operands (*UND* and *UND* sections) for `^'
	s390: fix strrchr() implementation
	csky: don't let sigreturn play with priveleged bits of status register
	csky: Fixup regs.sr broken in ptrace
	btrfs: unlock newly allocated extent buffer after error
	btrfs: deal with errors when replaying dir entry during log replay
	btrfs: deal with errors when adding inode reference during log replay
	btrfs: check for error when looking up inode during dir entry replay
	watchdog: orion: use 0 for unset heartbeat
	x86/resctrl: Free the ctrlval arrays when domain_setup_mon_state() fails
	mei: me: add Ice Lake-N device id.
	xhci: guard accesses to ep_state in xhci_endpoint_reset()
	xhci: Fix command ring pointer corruption while aborting a command
	xhci: Enable trust tx length quirk for Fresco FL11 USB controller
	cb710: avoid NULL pointer subtraction
	efi/cper: use stack buffer for error record decoding
	efi: Change down_interruptible() in virt_efi_reset_system() to down_trylock()
	usb: musb: dsps: Fix the probe error path
	Input: xpad - add support for another USB ID of Nacon GC-100
	USB: serial: qcserial: add EM9191 QDL support
	USB: serial: option: add Quectel EC200S-CN module support
	USB: serial: option: add Telit LE910Cx composition 0x1204
	USB: serial: option: add prod. id for Quectel EG91
	virtio: write back F_VERSION_1 before validate
	EDAC/armada-xp: Fix output of uncorrectable error counter
	nvmem: Fix shift-out-of-bound (UBSAN) with byte size cells
	x86/Kconfig: Do not enable AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT automatically
	powerpc/xive: Discard disabled interrupts in get_irqchip_state()
	iio: adc: aspeed: set driver data when adc probe.
	iio: adc128s052: Fix the error handling path of 'adc128_probe()'
	iio: mtk-auxadc: fix case IIO_CHAN_INFO_PROCESSED
	iio: light: opt3001: Fixed timeout error when 0 lux
	iio: ssp_sensors: add more range checking in ssp_parse_dataframe()
	iio: ssp_sensors: fix error code in ssp_print_mcu_debug()
	iio: dac: ti-dac5571: fix an error code in probe()
	sctp: account stream padding length for reconf chunk
	gpio: pca953x: Improve bias setting
	net: arc: select CRC32
	net: korina: select CRC32
	net/mlx5e: Mutually exclude RX-FCS and RX-port-timestamp
	net: stmmac: fix get_hw_feature() on old hardware
	net: encx24j600: check error in devm_regmap_init_encx24j600
	ethernet: s2io: fix setting mac address during resume
	nfc: fix error handling of nfc_proto_register()
	NFC: digital: fix possible memory leak in digital_tg_listen_mdaa()
	NFC: digital: fix possible memory leak in digital_in_send_sdd_req()
	pata_legacy: fix a couple uninitialized variable bugs
	ata: ahci_platform: fix null-ptr-deref in ahci_platform_enable_regulators()
	mlxsw: thermal: Fix out-of-bounds memory accesses
	platform/mellanox: mlxreg-io: Fix argument base in kstrtou32() call
	drm/panel: olimex-lcd-olinuxino: select CRC32
	drm/msm: Fix null pointer dereference on pointer edp
	drm/msm/dsi: Fix an error code in msm_dsi_modeset_init()
	drm/msm/dsi: fix off by one in dsi_bus_clk_enable error handling
	acpi/arm64: fix next_platform_timer() section mismatch error
	mqprio: Correct stats in mqprio_dump_class_stats().
	qed: Fix missing error code in qed_slowpath_start()
	r8152: select CRC32 and CRYPTO/CRYPTO_HASH/CRYPTO_SHA256
	ionic: don't remove netdev->dev_addr when syncing uc list
	Linux 5.4.155

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

parents 615b2824 4f508aa9

Makefile

+1 −1

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

arch/csky/kernel/ptrace.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,8 @@ static int gpr_set(struct task_struct *target,
		if (ret)
		return ret;

		regs.sr = task_pt_regs(target)->sr;
		/* BIT(0) of regs.sr is Condition Code/Carry bit */
		regs.sr = (regs.sr & BIT(0)) \| (task_pt_regs(target)->sr & ~BIT(0));
		#ifdef CONFIG_CPU_HAS_HILO
		regs.dcsr = task_pt_regs(target)->dcsr;
		#endif

arch/csky/kernel/signal.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -52,10 +52,14 @@ static long restore_sigcontext(struct pt_regs *regs,
		struct sigcontext __user *sc)
		{
		int err = 0;
		unsigned long sr = regs->sr;

		/* sc_pt_regs is structured the same as the start of pt_regs */
		err \|= __copy_from_user(regs, &sc->sc_pt_regs, sizeof(struct pt_regs));

		/* BIT(0) of regs->sr is Condition Code/Carry bit */
		regs->sr = (sr & ~1) \| (regs->sr & 1);

		/* Restore the floating-point state. */
		err \|= restore_fpu_state(sc);

arch/powerpc/sysdev/xive/common.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -990,7 +990,8 @@ static int xive_get_irqchip_state(struct irq_data *data,
		* interrupt to be inactive in that case.
		*/
		*state = (pq != XIVE_ESB_INVALID) && !xd->stale_p &&
		(xd->saved_p \|\| !!(pq & XIVE_ESB_VAL_P));
		(xd->saved_p \|\| (!!(pq & XIVE_ESB_VAL_P) &&
		!irqd_irq_disabled(data)));
		return 0;
		default:
		return -EINVAL;

arch/s390/lib/string.c

+7 −8

Original line number	Diff line number	Diff line
		@@ -246,13 +246,12 @@ EXPORT_SYMBOL(strcmp);
		#ifdef __HAVE_ARCH_STRRCHR
		char strrchr(const char s, int c)
		{
		size_t len = __strend(s) - s;
		ssize_t len = __strend(s) - s;

		if (len)
		do {
		if (s[len] == (char)c)
		return (char *)s + len;
		} while (--len > 0);
		} while (--len >= 0);
		return NULL;
		}
		EXPORT_SYMBOL(strrchr);