Commit 48592120 authored May 31, 2021 by Greg Kroah-Hartman

Merge 4.19.192 into android-4.19-stable



Changes in 4.19.192
	firmware: arm_scpi: Prevent the ternary sign expansion bug
	openrisc: Fix a memory leak
	RDMA/rxe: Clear all QP fields if creation failed
	scsi: qla2xxx: Fix error return code in qla82xx_write_flash_dword()
	RDMA/mlx5: Recover from fatal event in dual port mode
	platform/x86: dell-smbios-wmi: Fix oops on rmmod dell_smbios
	ptrace: make ptrace() fail if the tracee changed its pid unexpectedly
	nvmet: seset ns->file when open fails
	locking/mutex: clear MUTEX_FLAGS if wait_list is empty due to signal
	cifs: fix memory leak in smb2_copychunk_range
	ALSA: dice: fix stream format for TC Electronic Konnekt Live at high sampling transfer frequency
	ALSA: line6: Fix racy initialization of LINE6 MIDI
	ALSA: dice: fix stream format at middle sampling rate for Alesis iO 26
	ALSA: usb-audio: Validate MS endpoint descriptors
	ALSA: bebob/oxfw: fix Kconfig entry for Mackie d.2 Pro
	Revert "ALSA: sb8: add a check for request_region"
	ALSA: hda/realtek: reset eapd coeff to default value for alc287
	ALSA: hda/realtek: Add some CLOVE SSIDs of ALC293
	Revert "rapidio: fix a NULL pointer dereference when create_workqueue() fails"
	rapidio: handle create_workqueue() failure
	Revert "serial: mvebu-uart: Fix to avoid a potential NULL pointer dereference"
	xen-pciback: reconfigure also from backend watch handler
	dm snapshot: fix crash with transient storage and zero chunk size
	Revert "video: hgafb: fix potential NULL pointer dereference"
	Revert "net: stmicro: fix a missing check of clk_prepare"
	Revert "leds: lp5523: fix a missing check of return value of lp55xx_read"
	Revert "hwmon: (lm80) fix a missing check of bus read in lm80 probe"
	Revert "video: imsttfb: fix potential NULL pointer dereferences"
	Revert "ecryptfs: replace BUG_ON with error handling code"
	Revert "scsi: ufs: fix a missing check of devm_reset_control_get"
	Revert "gdrom: fix a memory leak bug"
	cdrom: gdrom: deallocate struct gdrom_unit fields in remove_gdrom
	cdrom: gdrom: initialize global variable at init time
	Revert "media: rcar_drif: fix a memory disclosure"
	Revert "rtlwifi: fix a potential NULL pointer dereference"
	Revert "qlcnic: Avoid potential NULL pointer dereference"
	Revert "niu: fix missing checks of niu_pci_eeprom_read"
	ethernet: sun: niu: fix missing checks of niu_pci_eeprom_read()
	net: stmicro: handle clk_prepare() failure during init
	scsi: ufs: handle cleanup correctly on devm_reset_control_get error
	net: rtlwifi: properly check for alloc_workqueue() failure
	leds: lp5523: check return value of lp5xx_read and jump to cleanup code
	qlcnic: Add null check after calling netdev_alloc_skb
	video: hgafb: fix potential NULL pointer dereference
	vgacon: Record video mode changes with VT_RESIZEX
	vt: Fix character height handling with VT_RESIZEX
	tty: vt: always invoke vc->vc_sw->con_resize callback
	video: hgafb: correctly handle card detect failure during probe
	Bluetooth: SMP: Fail if remote and local public keys are identical
	Linux 4.19.192

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

parents 8ff7a6bc 6b7b0056

Makefile

+1 −1

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

arch/openrisc/kernel/setup.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -281,6 +281,8 @@ void calibrate_delay(void)
		pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n",
		loops_per_jiffy / (500000 / HZ),
		(loops_per_jiffy / (5000 / HZ)) % 100, loops_per_jiffy);

		of_node_put(cpu);
		}

		void __init setup_arch(char **cmdline_p)

drivers/cdrom/gdrom.c

+10 −3

Original line number	Diff line number	Diff line
		@@ -775,6 +775,13 @@ static int probe_gdrom_setupqueue(void)
		static int probe_gdrom(struct platform_device *devptr)
		{
		int err;

		/*
		* Ensure our "one" device is initialized properly in case of previous
		* usages of it
		*/
		memset(&gd, 0, sizeof(gd));

		/* Start the device */
		if (gdrom_execute_diagnostic() != 1) {
		pr_warning("ATA Probe for GDROM failed\n");
		@@ -857,6 +864,8 @@ static int remove_gdrom(struct platform_device *devptr)
		if (gdrom_major)
		unregister_blkdev(gdrom_major, GDROM_DEV_NAME);
		unregister_cdrom(gd.cd_info);
		kfree(gd.cd_info);
		kfree(gd.toc);

		return 0;
		}
		@@ -872,7 +881,7 @@ static struct platform_driver gdrom_driver = {
		static int __init init_gdrom(void)
		{
		int rc;
		gd.toc = NULL;

		rc = platform_driver_register(&gdrom_driver);
		if (rc)
		return rc;
		@@ -888,8 +897,6 @@ static void __exit exit_gdrom(void)
		{
		platform_device_unregister(pd);
		platform_driver_unregister(&gdrom_driver);
		kfree(gd.toc);
		kfree(gd.cd_info);
		}

		module_init(init_gdrom);

drivers/firmware/arm_scpi.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -563,8 +563,10 @@ static unsigned long scpi_clk_get_val(u16 clk_id)

		ret = scpi_send_message(CMD_GET_CLOCK_VALUE, &le_clk_id,
		sizeof(le_clk_id), &rate, sizeof(rate));
		if (ret)
		return 0;

		return ret ? ret : le32_to_cpu(rate);
		return le32_to_cpu(rate);
		}

		static int scpi_clk_set_val(u16 clk_id, unsigned long rate)

drivers/hwmon/lm80.c

+2 −9

Original line number	Diff line number	Diff line
		@@ -630,7 +630,6 @@ static int lm80_probe(struct i2c_client *client,
		struct device *dev = &client->dev;
		struct device *hwmon_dev;
		struct lm80_data *data;
		int rv;

		data = devm_kzalloc(dev, sizeof(struct lm80_data), GFP_KERNEL);
		if (!data)
		@@ -643,14 +642,8 @@ static int lm80_probe(struct i2c_client *client,
		lm80_init_client(client);

		/* A few vars need to be filled upon startup */
		rv = lm80_read_value(client, LM80_REG_FAN_MIN(1));
		if (rv < 0)
		return rv;
		data->fan[f_min][0] = rv;
		rv = lm80_read_value(client, LM80_REG_FAN_MIN(2));
		if (rv < 0)
		return rv;
		data->fan[f_min][1] = rv;
		data->fan[f_min][0] = lm80_read_value(client, LM80_REG_FAN_MIN(1));
		data->fan[f_min][1] = lm80_read_value(client, LM80_REG_FAN_MIN(2));

		hwmon_dev = devm_hwmon_device_register_with_groups(dev, client->name,
		data, lm80_groups);