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

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

Merge 5.4.190 into android11-5.4-lts 



Changes in 5.4.190
	memory: atmel-ebi: Fix missing of_node_put in atmel_ebi_probe
	net/sched: flower: fix parsing of ethertype following VLAN header
	veth: Ensure eth header is in skb's linear part
	gpiolib: acpi: use correct format characters
	mlxsw: i2c: Fix initialization error flow
	net/sched: fix initialization order when updating chain 0 head
	net: ethernet: stmmac: fix altr_tse_pcs function when using a fixed-link
	net/sched: taprio: Check if socket flags are valid
	cfg80211: hold bss_lock while updating nontrans_list
	drm/msm/dsi: Use connector directly in msm_dsi_manager_connector_init()
	net/smc: Fix NULL pointer dereference in smc_pnet_find_ib()
	sctp: Initialize daddr on peeled off socket
	testing/selftests/mqueue: Fix mq_perf_tests to free the allocated cpu set
	nfc: nci: add flush_workqueue to prevent uaf
	cifs: potential buffer overflow in handling symlinks
	drm/amd: Add USBC connector ID
	drm/amd/display: fix audio format not updated after edid updated
	drm/amd/display: Update VTEM Infopacket definition
	drm/amdkfd: Fix Incorrect VMIDs passed to HWS
	drm/amdkfd: Check for potential null return of kmalloc_array()
	Drivers: hv: vmbus: Prevent load re-ordering when reading ring buffer
	scsi: target: tcmu: Fix possible page UAF
	scsi: ibmvscsis: Increase INITIAL_SRP_LIMIT to 1024
	net: micrel: fix KS8851_MLL Kconfig
	ata: libata-core: Disable READ LOG DMA EXT for Samsung 840 EVOs
	gpu: ipu-v3: Fix dev_dbg frequency output
	regulator: wm8994: Add an off-on delay for WM8994 variant
	arm64: alternatives: mark patch_alternative() as `noinstr`
	tlb: hugetlb: Add more sizes to tlb_remove_huge_tlb_entry
	net: usb: aqc111: Fix out-of-bounds accesses in RX fixup
	drm/amd/display: Fix allocate_mst_payload assert on resume
	powerpc: Fix virt_addr_valid() for 64-bit Book3E & 32-bit
	scsi: mvsas: Add PCI ID of RocketRaid 2640
	scsi: megaraid_sas: Target with invalid LUN ID is deleted during scan
	drivers: net: slip: fix NPD bug in sl_tx_timeout()
	perf/imx_ddr: Fix undefined behavior due to shift overflowing the constant
	mm, page_alloc: fix build_zonerefs_node()
	mm: kmemleak: take a full lowmem check in kmemleak_*_phys()
	gcc-plugins: latent_entropy: use /dev/urandom
	ath9k: Properly clear TX status area before reporting to mac80211
	ath9k: Fix usage of driver-private space in tx_info
	btrfs: remove unused variable in btrfs_{start,write}_dirty_block_groups()
	btrfs: mark resumed async balance as writing
	ALSA: hda/realtek: Add quirk for Clevo PD50PNT
	ALSA: pcm: Test for "silence" field in struct "pcm_format_data"
	ipv6: fix panic when forwarding a pkt with no in6 dev
	drm/amd/display: don't ignore alpha property on pre-multiplied mode
	genirq/affinity: Consider that CPUs on nodes can be unbalanced
	tick/nohz: Use WARN_ON_ONCE() to prevent console saturation
	ARM: davinci: da850-evm: Avoid NULL pointer dereference
	dm integrity: fix memory corruption when tag_size is less than digest size
	smp: Fix offline cpu check in flush_smp_call_function_queue()
	i2c: pasemi: Wait for write xfers to finish
	dma-direct: avoid redundant memory sync for swiotlb
	ax25: add refcount in ax25_dev to avoid UAF bugs
	ax25: fix reference count leaks of ax25_dev
	ax25: fix UAF bugs of net_device caused by rebinding operation
	ax25: Fix refcount leaks caused by ax25_cb_del()
	ax25: fix UAF bug in ax25_send_control()
	ax25: fix NPD bug in ax25_disconnect
	ax25: Fix NULL pointer dereferences in ax25 timers
	ax25: Fix UAF bugs in ax25 timers
	Linux 5.4.190

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I375cb1d55a4a40c1c31b86c87ddb9235cefcb902
parents 347d6f40 dc213ac8

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 189

SUBLEVEL = 190

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/mach-davinci/board-da850-evm.c

+3 −1
Original line number Diff line number Diff line
@@ -1101,11 +1101,13 @@ static int __init da850_evm_config_emac(void) 
	int ret;

	u32 val;

	struct davinci_soc_info *soc_info = &davinci_soc_info;

	u8 rmii_en = soc_info->emac_pdata->rmii_en;

	u8 rmii_en;



	if (!machine_is_davinci_da850_evm())

		return 0;



	rmii_en = soc_info->emac_pdata->rmii_en;



	cfg_chip3_base = DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP3_REG);



	val = __raw_readl(cfg_chip3_base);

arch/arm64/kernel/alternative.c

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ bool alternative_is_applied(u16 cpufeature) 
/*

 * Check if the target PC is within an alternative block.

 */

static bool branch_insn_requires_update(struct alt_instr *alt, unsigned long pc)

static __always_inline bool branch_insn_requires_update(struct alt_instr *alt, unsigned long pc)

{

	unsigned long replptr = (unsigned long)ALT_REPL_PTR(alt);

	return !(pc >= replptr && pc <= (replptr + alt->alt_len));
@@ -49,7 +49,7 @@ static bool branch_insn_requires_update(struct alt_instr *alt, unsigned long pc) 


#define align_down(x, a)	((unsigned long)(x) & ~(((unsigned long)(a)) - 1))



static u32 get_alt_insn(struct alt_instr *alt, __le32 *insnptr, __le32 *altinsnptr)

static __always_inline u32 get_alt_insn(struct alt_instr *alt, __le32 *insnptr, __le32 *altinsnptr)

{

	u32 insn;
@@ -94,7 +94,7 @@ static u32 get_alt_insn(struct alt_instr *alt, __le32 *insnptr, __le32 *altinsnp 
	return insn;

}



static void patch_alternative(struct alt_instr *alt,

static noinstr void patch_alternative(struct alt_instr *alt,

			      __le32 *origptr, __le32 *updptr, int nr_inst)

{

	__le32 *replptr;

arch/powerpc/include/asm/page.h

+5 −1
Original line number Diff line number Diff line
@@ -132,7 +132,11 @@ static inline bool pfn_valid(unsigned long pfn) 
#define virt_to_page(kaddr)	pfn_to_page(virt_to_pfn(kaddr))

#define pfn_to_kaddr(pfn)	__va((pfn) << PAGE_SHIFT)



#define virt_addr_valid(kaddr)	pfn_valid(virt_to_pfn(kaddr))

#define virt_addr_valid(vaddr)	({					\

	unsigned long _addr = (unsigned long)vaddr;			\

	_addr >= PAGE_OFFSET && _addr < (unsigned long)high_memory &&	\

	pfn_valid(virt_to_pfn(_addr));					\

})



/*

 * On Book-E parts we need __va to parse the device tree and we can't

drivers/ata/libata-core.c

+3 −0
Original line number Diff line number Diff line
@@ -4580,6 +4580,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
						ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Crucial_CT*MX100*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Samsung SSD 840 EVO*",	NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_NO_DMA_LOG |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Samsung SSD 840*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Samsung SSD 850*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |