Unverified Commit 6d2f62dc authored Mar 28, 2024 by openeuler-ci-bot Committed by Gitee Mar 28, 2024

!5499 Backport 5.10.199 LTS patches from upstream

Merge Pull Request from: @sanglipeng 
 
https://gitee.com/openeuler/kernel/issues/I9AWJ5

Conflicts:
Already merged(30):
26788a5b48d9  RDMA/srp: Do not call scsi_done() from srp_abort()
55e06850c789  ieee802154: ca8210: Fix a potential UAF in ca8210_probe
6ac22ecdaad2  net: nfc: fix races in nfc_llcp_sock_get() and nfc_llcp_sock_get_sn()
a424807d860b  nfc: nci: assert requested protocol is valid
004bdab6edc7  arm64: die(): pass 'err' as long
a8d7c8484ff7  arm64: consistently pass ESR_ELx to die()
9113333d7c7c  arm64: rework FPAC exception handling
793ed958b62a  arm64: rework BTI exception handling
8a8d4cc303ef  arm64: allow kprobes on EL0 handlers
7a76df1ae1b3  arm64: split EL0/EL1 UNDEF handlers
0edde7fd1c3b  arm64: factor out EL1 SSBS emulation hook
15e964971ff7  arm64: factor insn read out of call_undef_hook()
5aa232345e4d  arm64: rework EL0 MRS emulation
2202536144bc  arm64: armv8_deprecated: fold ops into insn_emulation
0b6a7a9f6d94  arm64: armv8_deprecated move emulation functions
45a26d2a5394  arm64: armv8_deprecated: move aarch32 helper earlier
da7603cedb7d  arm64: armv8_deprecated: rework deprected instruction handling
489818719a88  arm64: armv8_deprecated: fix unused-function error
db9aafa19547  ravb: Fix use-after-free issue in ravb_tx_timeout_work()
c95fa5b20fe0  nfc: nci: fix possible NULL pointer dereference in send_acknowledge()
d78c5d8c23c3  x86/sev: Disable MMIO emulation from user mode
5bb9ba7dafbe  x86/sev: Check IOBM for IOIO exceptions from user-space
6550cbe25de1  x86/sev: Check for user-space IOIO pointing to kernel space
487a8e24643a  perf: Disallow mis-matched inherited group reads
cd2fbfd8b922  Input: powermate - fix use-after-free in powermate_config_complete
835cb1f78d74  arm64: report EL1 UNDEFs better
e985d78bdcf3  nvmet-tcp: Fix a possible UAF in queue intialization setup
196896455bd1  resource: Add irqresource_disabled()
8a8918b51080  ACPI: Drop acpi_dev_irqresource_disabled()
657a3ca8236c  xfrm6: fix inet6_dev refcount underflow problem

Rejected(3):
22c06bf1f99e  quota: Fix slow quotaoff
ce03f0234f9d  workqueue: Override implicit ordered attribute in workqueue_apply_unbound_cpumask()
ec93456c0289  x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs

Kabi broken(14):
de53e783caf2  net: add sysctl accept_ra_min_rtr_lft
304a7cf5b459  net: change accept_ra_min_rtr_lft to affect all RA
46996fc0f41a  net: release reference to inet6_dev pointer
eb74f0f2ea5a  xfrm: fix a data-race in xfrm_gen_index()
d1acb5a05430  xfrm: interface: use DEV_STATS_INC()
8c8969140ed9  drm/amd/display: only check available pipe to disable vbios mode.
d98dc50344ef  drm/amd/display: Don't set dpms_off for seamless boot
0883812f65ec  drm/connector: Give connector sysfs devices there own device_type
1a30b83e158b  drm/connector: Add a fwnode pointer to drm_connector and register with ACPI (v2)
71e1fc83bc25  drm/connector: Add drm_connector_find_by_fwnode() function (v3)
70d9ddadd556  drm/connector: Add support for out-of-band hotplug notification (v3)
cd8891ead10d  usb: typec: altmodes/displayport: Notify drm subsys of hotplug events
e5dc2336588b  usb: typec: altmodes/displayport: Signal hpd low when exiting mode
2df7bc7d8235  ipv4/fib: send notify when delete source address routes

Total patches: 199 - 30 - 3 - 14 = 152 
 
Link:https://gitee.com/openeuler/kernel/pulls/5499

 

Reviewed-by: Jialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com>

parents c9ff9cba 7bb36e18

Documentation/admin-guide/sysctl/net.rst

+9 −9

Original line number	Diff line number	Diff line
		@@ -31,9 +31,9 @@ see only some of them, depending on your kernel's configuration.

		Table : Subdirectories in /proc/sys/net

		========= =================== = ========== ==================
		========= =================== = ========== ===================
		Directory Content Directory Content
		========= =================== = ========== ==================
		========= =================== = ========== ===================
		802 E802 protocol mptcp Multipath TCP
		appletalk Appletalk protocol netfilter Network Filter
		ax25 AX25 netrom NET/ROM
		@@ -42,7 +42,7 @@ Table : Subdirectories in /proc/sys/net
		ethernet Ethernet protocol unix Unix domain sockets
		ipv4 IP version 4 x25 X.25 protocol
		ipv6 IP version 6
		========= =================== = ========== ==================
		========= =================== = ========== ===================

		1. /proc/sys/net/core - Network core options
		============================================

arch/arm/boot/dts/motorola-mapphone-common.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -765,6 +765,7 @@
		&uart3 {
		interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH
		&omap4_pmx_core 0x17c>;
		overrun-throttle-ms = <500>;
		};

		&uart4 {

arch/powerpc/include/asm/nohash/32/pte-8xx.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,13 @@ static inline pte_t pte_wrprotect(pte_t pte)

		#define pte_wrprotect pte_wrprotect

		static inline int pte_read(pte_t pte)
		{
		return (pte_val(pte) & _PAGE_RO) != _PAGE_NA;
		}

		#define pte_read pte_read

		static inline int pte_write(pte_t pte)
		{
		return !(pte_val(pte) & _PAGE_RO);

arch/powerpc/include/asm/nohash/64/pgtable.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -216,7 +216,7 @@ static inline int __ptep_test_and_clear_young(struct mm_struct *mm,
		{
		unsigned long old;

		if (pte_young(*ptep))
		if (!pte_young(*ptep))
		return 0;
		old = pte_update(mm, addr, ptep, _PAGE_ACCESSED, 0, 0);
		return (old & _PAGE_ACCESSED) != 0;

arch/powerpc/include/asm/nohash/pgtable.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -45,7 +45,9 @@ static inline int pte_write(pte_t pte)
		return pte_val(pte) & _PAGE_RW;
		}
		#endif
		#ifndef pte_read
		static inline int pte_read(pte_t pte) { return 1; }
		#endif
		static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; }
		static inline int pte_special(pte_t pte) { return pte_val(pte) & _PAGE_SPECIAL; }
		static inline int pte_none(pte_t pte) { return (pte_val(pte) & ~_PTE_NONE_MASK) == 0; }