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

Commit 1d2ccd15 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Treehugger Robot
Browse files

Merge 4.19.309 into android-4.19-stable 



Changes in 4.19.309
	netlink: Fix kernel-infoleak-after-free in __skb_datagram_iter
	tun: Fix xdp_rxq_info's queue_index when detaching
	lan78xx: enable auto speed configuration for LAN7850 if no EEPROM is detected
	net: usb: dm9601: fix wrong return value in dm9601_mdio_read
	Bluetooth: Avoid potential use-after-free in hci_error_reset
	Bluetooth: hci_event: Fix handling of HCI_EV_IO_CAPA_REQUEST
	Bluetooth: Enforce validation on max value of connection interval
	efi/capsule-loader: fix incorrect allocation size
	power: supply: bq27xxx-i2c: Do not free non existing IRQ
	ALSA: Drop leftover snd-rtctimer stuff from Makefile
	gtp: fix use-after-free and null-ptr-deref in gtp_newlink()
	wifi: nl80211: reject iftype change with mesh ID change
	btrfs: dev-replace: properly validate device names
	mmc: core: Fix eMMC initialization with 1-bit bus connection
	cachefiles: fix memory leak in cachefiles_add_cache()
	gpio: 74x164: Enable output pins after registers are reset
	Linux 4.19.309

Change-Id: I687e2cd91043b27619f8ad34d193d008dd0d845f
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 595ad747 1b5c9eb7

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 308

SUBLEVEL = 309

EXTRAVERSION =

NAME = "People's Front"

drivers/firmware/efi/capsule-loader.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static int efi_capsule_open(struct inode *inode, struct file *file) 
		return -ENOMEM;

	}



	cap_info->phys = kzalloc(sizeof(void *), GFP_KERNEL);

	cap_info->phys = kzalloc(sizeof(phys_addr_t), GFP_KERNEL);

	if (!cap_info->phys) {

		kfree(cap_info->pages);

		kfree(cap_info);

drivers/gpio/gpio-74x164.c

+2 −2
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ static int gen_74x164_probe(struct spi_device *spi) 
	if (IS_ERR(chip->gpiod_oe))

		return PTR_ERR(chip->gpiod_oe);



	gpiod_set_value_cansleep(chip->gpiod_oe, 1);



	spi_set_drvdata(spi, chip);



	chip->gpio_chip.label = spi->modalias;
@@ -158,6 +156,8 @@ static int gen_74x164_probe(struct spi_device *spi) 
		goto exit_destroy;

	}



	gpiod_set_value_cansleep(chip->gpiod_oe, 1);



	ret = gpiochip_add_data(&chip->gpio_chip, chip);

	if (!ret)

		return 0;

drivers/mmc/core/mmc.c

+2 −0
Original line number Diff line number Diff line
@@ -994,10 +994,12 @@ static int mmc_select_bus_width(struct mmc_card *card) 
	static unsigned ext_csd_bits[] = {

		EXT_CSD_BUS_WIDTH_8,

		EXT_CSD_BUS_WIDTH_4,

		EXT_CSD_BUS_WIDTH_1,

	};

	static unsigned bus_widths[] = {

		MMC_BUS_WIDTH_8,

		MMC_BUS_WIDTH_4,

		MMC_BUS_WIDTH_1,

	};

	struct mmc_host *host = card->host;

	unsigned idx, bus_width = 0;

drivers/net/gtp.c

+6 −6
Original line number Diff line number Diff line
@@ -1381,26 +1381,26 @@ static int __init gtp_init(void) 


	get_random_bytes(&gtp_h_initval, sizeof(gtp_h_initval));



	err = rtnl_link_register(&gtp_link_ops);

	err = register_pernet_subsys(&gtp_net_ops);

	if (err < 0)

		goto error_out;



	err = register_pernet_subsys(&gtp_net_ops);

	err = rtnl_link_register(&gtp_link_ops);

	if (err < 0)

		goto unreg_rtnl_link;

		goto unreg_pernet_subsys;



	err = genl_register_family(&gtp_genl_family);

	if (err < 0)

		goto unreg_pernet_subsys;

		goto unreg_rtnl_link;



	pr_info("GTP module loaded (pdp ctx size %zd bytes)\n",

		sizeof(struct pdp_ctx));

	return 0;



unreg_pernet_subsys:

	unregister_pernet_subsys(&gtp_net_ops);

unreg_rtnl_link:

	rtnl_link_unregister(&gtp_link_ops);

unreg_pernet_subsys:

	unregister_pernet_subsys(&gtp_net_ops);

error_out:

	pr_err("error loading GTP module loaded\n");

	return err;