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

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

Merge 5.4.157 into android11-5.4-lts 



Changes in 5.4.157
	ARM: 9133/1: mm: proc-macros: ensure *_tlb_fns are 4B aligned
	ARM: 9134/1: remove duplicate memcpy() definition
	ARM: 9139/1: kprobes: fix arch_init_kprobes() prototype
	ARM: 9141/1: only warn about XIP address when not compile testing
	powerpc/bpf: Fix BPF_MOD when imm == 1
	ipv6: use siphash in rt6_exception_hash()
	ipv4: use siphash instead of Jenkins in fnhe_hashfun()
	usbnet: sanity check for maxpacket
	usbnet: fix error return code in usbnet_probe()
	Revert "pinctrl: bcm: ns: support updated DT binding as syscon subnode"
	ata: sata_mv: Fix the error handling of mv_chip_id()
	nfc: port100: fix using -ERRNO as command type mask
	Revert "net: mdiobus: Fix memory leak in __mdiobus_register"
	net/tls: Fix flipped sign in tls_err_abort() calls
	mmc: vub300: fix control-message timeouts
	mmc: cqhci: clear HALT state after CQE enable
	mmc: dw_mmc: exynos: fix the finding clock sample value
	mmc: sdhci: Map more voltage level to SDHCI_POWER_330
	mmc: sdhci-esdhc-imx: clear the buffer_read_ready to reset standard tuning circuit
	cfg80211: scan: fix RCU in cfg80211_add_nontrans_list()
	net: lan78xx: fix division by zero in send path
	drm/ttm: fix memleak in ttm_transfered_destroy
	tcp_bpf: Fix one concurrency problem in the tcp_bpf_send_verdict function
	IB/qib: Protect from buffer overflow in struct qib_user_sdma_pkt fields
	IB/hfi1: Fix abba locking issue with sc_disable()
	nvmet-tcp: fix data digest pointer calculation
	nvme-tcp: fix data digest pointer calculation
	RDMA/mlx5: Set user priority for DCT
	arm64: dts: allwinner: h5: NanoPI Neo 2: Fix ethernet node
	regmap: Fix possible double-free in regcache_rbtree_exit()
	net: batman-adv: fix error handling
	net: Prevent infinite while loop in skb_tx_hash()
	RDMA/sa_query: Use strscpy_pad instead of memcpy to copy a string
	nios2: Make NIOS2_DTB_SOURCE_BOOL depend on !COMPILE_TEST
	net: ethernet: microchip: lan743x: Fix driver crash when lan743x_pm_resume fails
	net: ethernet: microchip: lan743x: Fix dma allocation failure by using dma_set_mask_and_coherent
	net: nxp: lpc_eth.c: avoid hang when bringing interface down
	net/tls: Fix flipped sign in async_wait.err assignment
	phy: phy_ethtool_ksettings_get: Lock the phy for consistency
	phy: phy_start_aneg: Add an unlocked version
	sctp: use init_tag from inithdr for ABORT chunk
	sctp: fix the processing for INIT_ACK chunk
	sctp: fix the processing for COOKIE_ECHO chunk
	sctp: add vtag check in sctp_sf_violation
	sctp: add vtag check in sctp_sf_do_8_5_1_E_sa
	sctp: add vtag check in sctp_sf_ootb
	net: use netif_is_bridge_port() to check for IFF_BRIDGE_PORT
	cfg80211: correct bridge/4addr mode check
	KVM: s390: clear kicked_mask before sleeping again
	KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu
	perf script: Check session->header.env.arch before using it
	Linux 5.4.157

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I8dd3b408b22bc98c06b6a941260157df2a40de00
parents 5f1f3614 e6de9a8b

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 156

SUBLEVEL = 157

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/boot/compressed/decompress.c

+3 −0
Original line number Diff line number Diff line
@@ -47,7 +47,10 @@ extern char * strchrnul(const char *, int); 
#endif



#ifdef CONFIG_KERNEL_XZ

/* Prevent KASAN override of string helpers in decompressor */

#undef memmove

#define memmove memmove

#undef memcpy

#define memcpy memcpy

#include "../../../../lib/decompress_unxz.c"

#endif

arch/arm/kernel/vmlinux-xip.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ ASSERT(__hyp_idmap_text_end - (__hyp_idmap_text_start & PAGE_MASK) <= PAGE_SIZE, 
ASSERT((_end - __bss_start) >= 12288, ".bss too small for CONFIG_XIP_DEFLATED_DATA")

#endif



#ifdef CONFIG_ARM_MPU

#if defined(CONFIG_ARM_MPU) && !defined(CONFIG_COMPILE_TEST)

/*

 * Due to PMSAv7 restriction on base address and size we have to

 * enforce minimal alignment restrictions. It was seen that weaker

arch/arm/mm/proc-macros.S

+1 −0
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ ENTRY(\name\()_cache_fns) 


.macro define_tlb_functions name:req, flags_up:req, flags_smp

	.type	\name\()_tlb_fns, #object

	.align 2

ENTRY(\name\()_tlb_fns)

	.long	\name\()_flush_user_tlb_range

	.long	\name\()_flush_kern_tlb_range

arch/arm/probes/kprobes/core.c

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ static struct undef_hook kprobes_arm_break_hook = { 


#endif /* !CONFIG_THUMB2_KERNEL */



int __init arch_init_kprobes()

int __init arch_init_kprobes(void)

{

	arm_probes_decode_init();

#ifdef CONFIG_THUMB2_KERNEL