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

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

Merge 4.14.274 into android-4.14-stable 



Changes in 4.14.274
	nfc: st21nfca: Fix potential buffer overflows in EVT_TRANSACTION
	net: ipv6: fix skb_over_panic in __ip6_append_data
	esp: Fix possible buffer overflow in ESP transformation
	staging: fbtft: fb_st7789v: reset display before initialization
	thermal: int340x: fix memory leak in int3400_notify()
	llc: fix netdevice reference leaks in llc_ui_bind()
	ALSA: pcm: Add stream lock during PCM reset ioctl operations
	ALSA: usb-audio: Add mute TLV for playback volumes on RODE NT-USB
	ALSA: cmipci: Restore aux vol on suspend/resume
	ALSA: pci: fix reading of swapped values from pcmreg in AC97 codec
	drivers: net: xgene: Fix regression in CRC stripping
	netfilter: nf_tables: initialize registers in nft_do_chain()
	ACPI / x86: Work around broken XSDT on Advantech DAC-BJ01 board
	ACPI: battery: Add device HID and quirk for Microsoft Surface Go 3
	ACPI: video: Force backlight native for Clevo NL5xRU and NL5xNU
	crypto: qat - disable registration of algorithms
	mac80211: fix potential double free on mesh join
	llc: only change llc->dev when bind() succeeds
	Linux 4.14.274

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I1fc0ccd8ac54ffb4727f0b62b65bf2ab95bcc165
parents ff318e0e af1af6eb

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 273

SUBLEVEL = 274

EXTRAVERSION =

NAME = Petit Gorille

arch/x86/kernel/acpi/boot.c

+24 −0
Original line number Diff line number Diff line
@@ -1343,6 +1343,17 @@ static int __init disable_acpi_pci(const struct dmi_system_id *d) 
	return 0;

}



static int __init disable_acpi_xsdt(const struct dmi_system_id *d)

{

	if (!acpi_force) {

		pr_notice("%s detected: force use of acpi=rsdt\n", d->ident);

		acpi_gbl_do_not_use_xsdt = TRUE;

	} else {

		pr_notice("Warning: DMI blacklist says broken, but acpi XSDT forced\n");

	}

	return 0;

}



static int __init dmi_disable_acpi(const struct dmi_system_id *d)

{

	if (!acpi_force) {
@@ -1463,6 +1474,19 @@ static const struct dmi_system_id acpi_dmi_table[] __initconst = { 
		     DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),

		     },

	 },

	/*

	 * Boxes that need ACPI XSDT use disabled due to corrupted tables

	 */

	{

	 .callback = disable_acpi_xsdt,

	 .ident = "Advantech DAC-BJ01",

	 .matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "NEC"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "Bearlake CRB Board"),

		     DMI_MATCH(DMI_BIOS_VERSION, "V1.12"),

		     DMI_MATCH(DMI_BIOS_DATE, "02/01/2011"),

		     },

	 },

	{}

};

drivers/acpi/battery.c

+12 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ enum acpi_battery_files { 


static const struct acpi_device_id battery_device_ids[] = {

	{"PNP0C0A", 0},



	/* Microsoft Surface Go 3 */

	{"MSHW0146", 0},



	{"", 0},

};
@@ -1183,6 +1187,14 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),

		},

	},

	{

		/* Microsoft Surface Go 3 */

		.callback = battery_notification_delay_quirk,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Surface Go 3"),

		},

	},

	{},

};

drivers/acpi/video_detect.c

+75 −0
Original line number Diff line number Diff line
@@ -356,6 +356,81 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
		DMI_MATCH(DMI_BOARD_NAME, "BA51_MV"),

		},

	},

	/*

	 * Clevo NL5xRU and NL5xNU/TUXEDO Aura 15 Gen1 and Gen2 have both a

	 * working native and video interface. However the default detection

	 * mechanism first registers the video interface before unregistering

	 * it again and switching to the native interface during boot. This

	 * results in a dangling SBIOS request for backlight change for some

	 * reason, causing the backlight to switch to ~2% once per boot on the

	 * first power cord connect or disconnect event. Setting the native

	 * interface explicitly circumvents this buggy behaviour, by avoiding

	 * the unregistering process.

	 */

	{

	.callback = video_detect_force_native,

	.ident = "Clevo NL5xRU",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

		DMI_MATCH(DMI_BOARD_NAME, "NL5xRU"),

		},

	},

	{

	.callback = video_detect_force_native,

	.ident = "Clevo NL5xRU",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "SchenkerTechnologiesGmbH"),

		DMI_MATCH(DMI_BOARD_NAME, "NL5xRU"),

		},

	},

	{

	.callback = video_detect_force_native,

	.ident = "Clevo NL5xRU",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Notebook"),

		DMI_MATCH(DMI_BOARD_NAME, "NL5xRU"),

		},

	},

	{

	.callback = video_detect_force_native,

	.ident = "Clevo NL5xRU",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

		DMI_MATCH(DMI_BOARD_NAME, "AURA1501"),

		},

	},

	{

	.callback = video_detect_force_native,

	.ident = "Clevo NL5xRU",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

		DMI_MATCH(DMI_BOARD_NAME, "EDUBOOK1502"),

		},

	},

	{

	.callback = video_detect_force_native,

	.ident = "Clevo NL5xNU",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"),

		DMI_MATCH(DMI_BOARD_NAME, "NL5xNU"),

		},

	},

	{

	.callback = video_detect_force_native,

	.ident = "Clevo NL5xNU",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "SchenkerTechnologiesGmbH"),

		DMI_MATCH(DMI_BOARD_NAME, "NL5xNU"),

		},

	},

	{

	.callback = video_detect_force_native,

	.ident = "Clevo NL5xNU",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Notebook"),

		DMI_MATCH(DMI_BOARD_NAME, "NL5xNU"),

		},

	},



	/*

	 * Desktops which falsely report a backlight and which our heuristics

drivers/crypto/qat/qat_common/qat_crypto.c

+8 −0
Original line number Diff line number Diff line
@@ -170,6 +170,14 @@ int qat_crypto_dev_config(struct adf_accel_dev *accel_dev) 
		goto err;

	if (adf_cfg_section_add(accel_dev, "Accelerator0"))

		goto err;



	/* Temporarily set the number of crypto instances to zero to avoid

	 * registering the crypto algorithms.

	 * This will be removed when the algorithms will support the

	 * CRYPTO_TFM_REQ_MAY_BACKLOG flag

	 */

	instances = 0;



	for (i = 0; i < instances; i++) {

		val = i;

		snprintf(key, sizeof(key), ADF_CY "%d" ADF_RING_BANK_NUM, i);