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

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

Merge 4.19.213 into android-4.19-stable 



Changes in 4.19.213
	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
	nds32/ftrace: Fix Error: invalid operands (*UND* and *UND* sections) for `^'
	s390: fix strrchr() implementation
	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
	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
	nvmem: Fix shift-out-of-bound (UBSAN) with byte size cells
	x86/Kconfig: Do not enable AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT automatically
	iio: adc: aspeed: set driver data when adc probe.
	iio: adc128s052: Fix the error handling path of 'adc128_probe()'
	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
	net: arc: select CRC32
	net: korina: select CRC32
	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
	platform/mellanox: mlxreg-io: Fix argument base in kstrtou32() call
	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
	Linux 4.19.213

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ieed0ccf749a762608588038f8b85a81e85d00c1b
parents 8ac05d76 ff079d72

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 212

SUBLEVEL = 213

EXTRAVERSION =

NAME = "People's Front"

arch/s390/lib/string.c

+7 −8
Original line number Diff line number Diff line
@@ -227,13 +227,12 @@ EXPORT_SYMBOL(strcmp); 
 */

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);

arch/x86/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1499,7 +1499,6 @@ config AMD_MEM_ENCRYPT 


config AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT

	bool "Activate AMD Secure Memory Encryption (SME) by default"

	default y

	depends on AMD_MEM_ENCRYPT

	---help---

	  Say yes to have system memory encrypted by default if running on

arch/x86/kernel/cpu/intel_rdt.c

+2 −0
Original line number Diff line number Diff line
@@ -563,6 +563,8 @@ static void domain_add_cpu(int cpu, struct rdt_resource *r) 
	}



	if (r->mon_capable && domain_setup_mon_state(r, d)) {

		kfree(d->ctrl_val);

		kfree(d->mbps_val);

		kfree(d);

		return;

	}

drivers/acpi/arm64/gtdt.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct acpi_gtdt_descriptor { 


static struct acpi_gtdt_descriptor acpi_gtdt_desc __initdata;



static inline void *next_platform_timer(void *platform_timer)

static inline __init void *next_platform_timer(void *platform_timer)

{

	struct acpi_gtdt_header *gh = platform_timer;