Unverified Commit c6f2acea authored Jun 03, 2024 by openeuler-ci-bot Committed by Gitee Jun 03, 2024

!8426 Backport 5.10.209 LTS patches from upstream

Merge Pull Request from: @sanglipeng

https://gitee.com/openeuler/kernel/issues/I9U3NW

Conflicts:
Already merged(47):
974f127fcf65 drm/amdgpu: Fix cat debugfs amdgpu_regs_didt causes kernel null pointer
06a33eec1dc2 nvme-core: check for too small lba shift
1059aa41c5a8 net/tg3: fix race condition in tg3_reset_task()
5e0be1229ae1 uio: Fix use-after-free in uio_open
6aa7865ba7ff EDAC/thunderx: Fix possible out-of-bounds string access
f2ec41874b65 powerpc/pseries/memhotplug: Quieten some DLPAR operations
b582aa1f6641 powerpc/pseries/memhp: Fix access beyond end of drmem array
1eefa93faf69 powerpc/powernv: Add a null pointer check to scom_debug_init_one()
f39c3d578c7d ACPI: LPIT: Avoid u32 multiplication overflow
47210a5754ba net: netlabel: Fix kerneldoc warnings
5ac84b01a09b netlabel: remove unused parameter in netlbl_netlink_auditinfo()
44a88650ba55 calipso: fix memory leak in netlbl_calipso_add_pass()
94c742324ed7 efivarfs: force RO when remounting if SetVariable is not supported
001a3f59d8c9 mtd: Fix gluebi NULL pointer dereference caused by ftl notifier
5c28478af371 gfs2: Fix kernel NULL pointer dereference in gfs2_rgrp_dump
2757f17972d8 bpf: fix check for attempt to corrupt spilled pointer
afea95d319cc bpf: Fix verification of indirect var-off stack access
da23bd709b46 ip6_tunnel: fix NEXTHDR_FRAGMENT handling in ip6_tnl_parse_tlv_enc_lim()
3233d8bf7893 media: pvrusb2: fix use after free on context disconnection
6f866885e147 f2fs: fix to avoid dirent corruption
aeed2b4e4a70 drm/amd/pm: fix a double-free in si_dpm_init
520e213a0b97 drivers/amd/pm: fix a use-after-free in kv_parse_power_table
c8c1158ffb00 binder: fix use-after-free in shinker's callback
cce8ba6fa4ec xen-netback: don't produce zero-size SKB frags
7e7a0d86542b binder: fix race between mmput() and do_exit()
394c6c0b6d9b Bluetooth: Fix atomicity violation in {min,max}_key_size_set
ba7be6667408 KVM: arm64: vgic-its: Avoid potential UAF in LPI translation cache
bc57f3ef8a9e serial: 8250: omap: Don't skip resource freeing if pm_runtime_resume_and_get() failed
6e04a9d30509 serial: imx: fix tx statemachine deadlock
f775f2621c2a nvmet-tcp: Fix a kernel panic when host sends an invalid H2C PDU length
5ff00408e502 apparmor: avoid crash when parsed profile name is empty
0de2e62067d2 nvmet-tcp: Fix the H2C expected PDU len calculation
e8bfdf630142 mlxsw: spectrum_acl_erp: Fix error flow of pool allocation failure
936d06d699c3 mlxsw: spectrum: Use 'bitmap_zalloc()' when applicable
a557dbda6407 mlxsw: spectrum_acl_tcam: Add missing mutex_destroy()
d3669ebc4c2a mlxsw: spectrum_acl_tcam: Make fini symmetric to init
a9b233b287aa mlxsw: spectrum_acl_tcam: Reorder functions to avoid forward declarations
56750ea5d154 mlxsw: spectrum_acl_tcam: Fix stack corruption
3e47740091b0 f2fs: explicitly null-terminate the xattr list
c0f1db7380aa jbd2: fix soft lockup in journal_finish_inode_data_buffers()
dbf8b0d9387f ida: Fix crash in ida_free when the bitmap is empty
5a669f3511d2 powerpc/imc-pmu: Add a null pointer check in update_events_in_group()
acd413da3e1f pstore: ram_core: fix possible overflow in persistent_ram_init_ecc()
53926e2a3962 drm/bridge: tpd12s015: Drop buggy __exit annotation for remove function
57ca7984806d drm/radeon: check the alloc_workqueue return value in radeon_crtc_init()
927626a20738 mfd: syscon: Fix null pointer dereference in of_syscon_register()
2295c22348fa net: qualcomm: rmnet: fix global oob in rmnet_policy

Rejected(4):
14f57a013a95 crypto: virtio - Wait for tasklet to complete on device remove
7a0f8295e7e1 scsi: hisi_sas: Replace with standard error code return value
3b8d7a1b8519 rootfs: Fix support for rootfstype= when root= is given
9b5a278594b9 KVM: arm64: vgic-v4: Restore pending state on host userspace write

Total patches: 287 - 47 - 4 = 236

Link:https://gitee.com/openeuler/kernel/pulls/8426

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

parents 7e9c7a87 48e5e357

arch/arc/kernel/signal.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ struct rt_sigframe {
		unsigned int sigret_magic;
		};

		static int save_arcv2_regs(struct sigcontext mctx, struct pt_regs regs)
		static int save_arcv2_regs(struct sigcontext __user mctx, struct pt_regs regs)
		{
		int err = 0;
		#ifndef CONFIG_ISA_ARCOMPACT
		@@ -74,12 +74,12 @@ static int save_arcv2_regs(struct sigcontext mctx, struct pt_regs regs)
		#else
		v2abi.r58 = v2abi.r59 = 0;
		#endif
		err = __copy_to_user(&mctx->v2abi, &v2abi, sizeof(v2abi));
		err = __copy_to_user(&mctx->v2abi, (void const *)&v2abi, sizeof(v2abi));
		#endif
		return err;
		}

		static int restore_arcv2_regs(struct sigcontext mctx, struct pt_regs regs)
		static int restore_arcv2_regs(struct sigcontext __user mctx, struct pt_regs regs)
		{
		int err = 0;
		#ifndef CONFIG_ISA_ARCOMPACT

arch/arm/boot/dts/qcom-apq8064.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -760,7 +760,7 @@

		xoadc: xoadc@197 {
		compatible = "qcom,pm8921-adc";
		reg = <197>;
		reg = <0x197>;
		interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>;
		#address-cells = <2>;
		#size-cells = <0>;

arch/arm/mach-davinci/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		menuconfig ARCH_DAVINCI
		bool "TI DaVinci"
		depends on ARCH_MULTI_V5
		select CPU_ARM926T
		select DAVINCI_TIMER
		select ZONE_DMA
		select PM_GENERIC_DOMAINS if PM

arch/arm/mach-sunxi/mc_smp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -804,12 +804,12 @@ static int __init sunxi_mc_smp_init(void)
		for (i = 0; i < ARRAY_SIZE(sunxi_mc_smp_data); i++) {
		ret = of_property_match_string(node, "enable-method",
		sunxi_mc_smp_data[i].enable_method);
		if (!ret)
		if (ret >= 0)
		break;
		}

		of_node_put(node);
		if (ret)
		if (ret < 0)
		return -ENODEV;

		is_a83t = sunxi_mc_smp_data[i].is_a83t;

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@
		compatible = "microchip,mcp7940x";
		reg = <0x6f>;
		interrupt-parent = <&gpiosb>;
		interrupts = <5 0>; /* GPIO2_5 */
		interrupts = <5 IRQ_TYPE_EDGE_FALLING>; /* GPIO2_5 */
		};
		};