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

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

Merge 5.4.254 into android11-5.4-lts 



Changes in 5.4.254
	mmc: moxart: read scr register without changing byte order
	ipv6: adjust ndisc_is_useropt() to also return true for PIO
	dmaengine: pl330: Return DMA_PAUSED when transaction is paused
	drm/nouveau/gr: enable memory loads on helper invocation on all channels
	radix tree test suite: fix incorrect allocation size for pthreads
	x86/pkeys: Revert a5eff725 ("x86/pkeys: Add PKRU value to init_fpstate")
	nilfs2: fix use-after-free of nilfs_root in dirtying inodes via iput
	iio: cros_ec: Fix the allocation size for cros_ec_command
	binder: fix memory leak in binder_init()
	usb-storage: alauda: Fix uninit-value in alauda_check_media()
	usb: dwc3: Properly handle processing of pending events
	usb: common: usb-conn-gpio: Prevent bailing out if initial role is none
	x86/cpu/amd: Enable Zenbleed fix for AMD Custom APU 0405
	x86/mm: Fix VDSO and VVAR placement on 5-level paging machines
	x86: Move gds_ucode_mitigated() declaration to header
	drm/nouveau/disp: Revert a NULL check inside nouveau_connector_get_modes
	selftests/rseq: Fix build with undefined __weak
	mISDN: Update parameter type of dsp_cmx_send()
	net/packet: annotate data-races around tp->status
	bonding: Fix incorrect deletion of ETH_P_8021AD protocol vid from slaves
	dccp: fix data-race around dp->dccps_mss_cache
	drivers: net: prevent tun_build_skb() to exceed the packet size limit
	IB/hfi1: Fix possible panic during hotplug remove
	wifi: cfg80211: fix sband iftype data lookup for AP_VLAN
	dmaengine: mcf-edma: Fix a potential un-allocated memory access
	net/mlx5: Allow 0 for total host VFs
	ibmvnic: Handle DMA unmapping of login buffs in release functions
	btrfs: don't stop integrity writeback too early
	btrfs: set cache_block_group_error if we find an error
	nvme-tcp: fix potential unbalanced freeze & unfreeze
	nvme-rdma: fix potential unbalanced freeze & unfreeze
	netfilter: nf_tables: report use refcount overflow
	scsi: core: Fix legacy /proc parsing buffer overflow
	scsi: storvsc: Fix handling of virtual Fibre Channel timeouts
	scsi: 53c700: Check that command slot is not NULL
	scsi: snic: Fix possible memory leak if device_add() fails
	scsi: core: Fix possible memory leak if device_add() fails
	alpha: remove __init annotation from exported page_is_ram()
	sch_netem: fix issues in netem_change() vs get_dist_table()
	Linux 5.4.254

Change-Id: I187a81acd36ef0ec486a959c626f1f06373170cc
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 27926744 fd2a1d1f

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 253

SUBLEVEL = 254

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/alpha/kernel/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -394,8 +394,7 @@ setup_memory(void *kernel_end) 
extern void setup_memory(void *);

#endif /* !CONFIG_DISCONTIGMEM */



int __init

page_is_ram(unsigned long pfn)

int page_is_ram(unsigned long pfn)

{

	struct memclust_struct * cluster;

	struct memdesc_struct * memdesc;

arch/x86/entry/vdso/vma.c

+2 −2
Original line number Diff line number Diff line
@@ -222,8 +222,8 @@ static unsigned long vdso_addr(unsigned long start, unsigned len) 


	/* Round the lowest possible end address up to a PMD boundary. */

	end = (start + len + PMD_SIZE - 1) & PMD_MASK;

	if (end >= TASK_SIZE_MAX)

		end = TASK_SIZE_MAX;

	if (end >= DEFAULT_MAP_WINDOW)

		end = DEFAULT_MAP_WINDOW;

	end -= len;



	if (end > start) {

arch/x86/include/asm/processor.h

+2 −0
Original line number Diff line number Diff line
@@ -976,4 +976,6 @@ enum taa_mitigations { 
	TAA_MITIGATION_TSX_DISABLED,

};



extern bool gds_ucode_mitigated(void);



#endif /* _ASM_X86_PROCESSOR_H */

arch/x86/kernel/cpu/amd.c

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ static const int amd_erratum_1054[] = 
static const int amd_zenbleed[] =

	AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x30, 0x0, 0x4f, 0xf),

			   AMD_MODEL_RANGE(0x17, 0x60, 0x0, 0x7f, 0xf),

			   AMD_MODEL_RANGE(0x17, 0x90, 0x0, 0x91, 0xf),

			   AMD_MODEL_RANGE(0x17, 0xa0, 0x0, 0xaf, 0xf));



static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum)