Unverified Commit b32a887d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11079 Backport 5.10.214 - 5.10.215 LTS patches from upstream

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

Conflicts:
Already merged(73):
fcbd99b3c7330   amdkfd: use calloc instead of kzalloc to avoid integer overflow
bacb8c3ab86dc   wifi: brcmfmac: Fix use-after-free bug in brcmf_cfg80211_detach
7936e5c8da5bc   media: xc4000: Fix atomicity violation in xc4000_get_frequency
8f599ab6fabbc   ubifs: Set page uptodate in the correct place
ae60e3342296f   clk: qcom: gcc-ipq6018: fix terminating of frequency table arrays
3ff4a0f6a8f0a   clk: qcom: mmcc-msm8974: fix terminating of frequency table arrays
bbe068b24409e   PCI/PM: Drain runtime-idle callbacks before driver removal
b07326747952c   Revert "Revert "md/raid5: Wait for MD_SB_CHANGE_PENDING in raid5d""
068ab2759bc0b   mac802154: fix llsec key resources release in mac802154_llsec_key_del
d85c11c97ecf9   mm: swap: fix race between free_swap_and_cache() and swapoff()
e8e8b19731722   ext4: fix corruption during on-line resize
4595d90b5d2ea   nfs: fix UAF in direct writes
ad68ce4936165   vfio/platform: Disable virqfds on cleanup
dd199e5b759ff   soc: fsl: qbman: Always disable interrupts when taking cgr_lock
32edca2f03a6c   soc: fsl: qbman: Use raw spinlock for cgr_lock
6470078ab3d8f   s390/zcrypt: fix reference counting on zcrypt card objects
f0fe7ad5aff4f   nilfs2: prevent kernel bug at submit_bh_wbc()
493aa6bdcffd9   wireguard: netlink: access device through ctx instead of peer
284fb1003d5da   USB: usb-storage: Prevent divide-by-0 error in isd200_ata_command
ef846cdbd100f   usb: gadget: ncm: Fix handling of zero block length packets
1ce408f75ccf1   vt: fix unicode buffer corruption when deleting characters
e8b067c4058c0   wifi: mac80211: check/clear fast rx for non-4addr sta VLAN changes
6d9395ba7f85b   net: ll_temac: platform_get_resource replaced by wrong function
5c2386ba80e77   scsi: core: Fix unremoved procfs host directory regression
3e944ddc17c04   usb: udc: remove warning when queue disabled ep 
67b2d35853c2d   scsi: qla2xxx: Fix command flush on cable pull
e3e27d2b446de   tcp: properly terminate timers for kernel sockets
9970e059af471   bpf: Protect against int overflow for stack access size
cfb786b03b03c   net/rds: fix possible cp null dereference
09452c8fcbd78   vfio/platform: Create persistent IRQ handlers
7b6fba6918714   netfilter: nf_tables: reject new basechain after table flag update
46c4481938e2c   netfilter: nf_tables: flush pending destroy work before exit_net release
940d41caa71f0   netfilter: nf_tables: Fix potential data-race in __nft_flowtable_type_get()
0f038242b77dd   netfilter: validate user input for expected length
dd54b48db0c82   bpf, sockmap: Prevent lock inversion deadlock in map delete elem
5e45dc4408857   net/sched: act_skbmod: prevent kernel-infoleak
b14b9f9503ec8   erspan: make sure erspan_base_hdr is present in skb->head
fd307f2d91d40   ipv6: Fix infinite recursion in fib6_dump_done().
b8e82128b44fa   i40e: fix vf may be used uninitialized in this function warning
3391b157780bb   udp: do not accept non-tunnel GSO skbs landing in a tunnel
7f62d985e94eb   driver core: Introduce device_link_wait_removal()
3127b2ee50c42   of: dynamic: Synchronize of_changeset_destroy() with the devlink removals
bc4d1ebca11b4   net/smc: reduce rtnl pressure in smc_pnet_create_pnetids_list()
c473288f27d15   scsi: lpfc: Fix possible memory leak in lpfc_rcv_padisc()
b0cb5564c3e8e   block: prevent division by zero in blk_rq_stat_sum()
951838fee462a   fbmon: prevent division by zero in fb_videomode_from_videomode()
b58d0ac35f6d7   netfilter: nf_tables: discard table flag update with pending basechain deletion
ada28eb4b9561   tty: n_gsm: require CAP_NET_ADMIN to attach N_GSM0710 ldisc
c2b2430b48f3c   x86/mm/pat: fix VM_PAT handling in COW mappings
fe34587acc995   drm/i915/gt: Reset queue_priority_hint on parking
f8730d6335e5f   KVM: Always flush async #PF workqueue when vCPU is being destroyed
a276c595c3a62   fat: fix uninitialized field in nostale filehandles
0a16a633a208b   ubi: Check for too small LEB size in VTBL code
bce7345ee0b55   x86/CPU/AMD: Update the Zenbleed microcode revisions
648906b645f4a   PCI/ERR: Clear AER status only when we control AER
9759ff196e7d2   dm snapshot: fix lockup in dm_exception_table_exit
e2d45f467096e   netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout
fe40ffbca19dc   netfilter: nf_tables: disallow anonymous set with timeout flag
2d13b79640b14   KVM: SVM: Flush pages under kvm->lock to fix UAF in svm_register_enc_region()
94eb0293703ce   fs/aio: Check IOCB_AIO_RW before the struct aio_kiocb conversion
0fc88aeb2e32b   xen/events: close evtchn after mapping cleanup
4e37416e4ee1b   serial: sc16is7xx: convert from _raw_ to _noinc_ regmap functions for FIFO
aa39e6878f61f   ALSA: sh: aica: reorder cleanup operations to avoid UAF bugs
5c2386ba80e77   scsi: core: Fix unremoved procfs host directory regression
34a81f5259b9e   x86/cpu: Enable STIBP on AMD if Automatic IBRS is enabled
e451709573f8b   USB: core: Fix deadlock in usb_deauthorize_interface()
6f3ae02bbb62f   netfilter: nf_tables: disallow timeout for anonymous sets
3dd9be6cb55e0   vfio/pci: Lock external INTx masking ops
a563fc18583ca   vfio/fsl-mc: Block calling interrupt handler without trigger
8f6dfa1f1efe6   block: add check that partition length needs to be aligned with block size
98e2b97acb875   pstore/zone: Add a null pointer check to the psz_kmsg_read
4720d590c4cb5   btrfs: send: handle path ref underflow in header iterate_inode_ref()
674c1c4229e74   sysv: don't call sb_bread() with pointers_lock held


Rejected(51):
2c1a504931896  Documentation/hw-vuln: Update spectre doc
d3084b03098ae  x86/cpu: Support AMD Automatic IBRS
127dbb3d8be83  timers: Update kernel-doc for various functions
fa576cdd4d244  timers: Use del_timer_sync() even on UP
d8166e8adb7ff  timers: Rename del_timer_sync() to timer_delete_sync()
39f7310eaa795  PCI: Drop pci_device_remove() test of pci_dev->driver
1f5ea9e3aeea8  PCI/ERR: Cache RCEC EA Capability offset in pci_init_capabilities()
619013d797397  PCI: Cache PCIe Device Capabilities register
c542f3a70521e  soc: fsl: qbman: Add helper for sanity checking cgr ops
449b8bdcde9f7  cpufreq: brcmstb-avs-cpufreq: fix up "add check for cpufreq_cpu_get's return value"
35e36eac881cd  x86/bugs: Add asm helpers for executing VERW
66d5260fc7d5a  (x86/rfds: Mitigate Register File Data Sampling (RFDS))
33414e560f034  perf/core: Fix reentry problem in perf_output_read_group()
755e53bbc61bc  nfc: nci: Fix uninit-value in nci_dev_up and nci_ntf_packet
89583ff143c24  x86/cpufeatures: Add new word for scattered features
561d5e1998d58  vfio/pci: Disable auto-enable of exclusive INTx IRQ
d6f77b5e47855  vfio: Introduce interface to flush virqfd inject workqueue
27d40bf72dd9a  vfio/pci: Create persistent INTx handler
e7ea043bc3f19  x86/srso: Add SRSO mitigation for Hygon processors
bb5fb12c50d91  x86/cpufeatures: Add CPUID_LNX_5 to track recently added Linux-defined word
87299cdaae757  btrfs: handle chunk tree lookup error in btrfs_relocate_sys_chunks()
453c8da7ef6dc  netfilter: nf_tables: release batch on table validation from abort path
2cee2ff7f8cce  netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path
1502b87c652a6  drm/vmwgfx: stop using ttm_bo_create v2
b6fc792bf8f25  drm/vmwgfx: switch over to the new pin interface v2
dc7cd107cef32  drm/vmwgfx/vmwgfx_cmdbuf_res: Remove unused variable 'ret'
675ebda69c5a0  drm/vmwgfx: Fix some static checker warnings
c560327d900ba  drm/vmwgfx: Fix possible null pointer derefence with invalid contexts
6b4bb49e3418a  block: introduce zone_write_granularity limit
96661f8c3d5f8  block: Clear zone limits for a non-zoned stacked queue
83a2275f9d323  bounds: support non-power-of-two CONFIG_NR_CPUS
81d9ca1597913  PCI: Work around Intel I210 ROM BAR overlap defect
51411a4d0a8bb  PCI/ASPM: Make Intel DG2 L1 acceptable latency unlimited
a654d0a1863bd  PCI/DPC: Quirk PIO log size for certain Intel Root Ports
be7f399e3ffd7  PCI/DPC: Quirk PIO log size for Intel Raptor Lake Root Ports
8b20c6f894b7d  x86/asm: Add _ASM_RIP() macro for x86-64 (%rip) suffix
edc702b4a820f  x86/entry_64: Add VERW just before userspace transition
50f021f0b9856  x86/entry_32: Add VERW just before userspace transition
6192d9ed311f7  x86/bugs: Use ALTERNATIVE() instead of mds_user_clear static key
52aad34ee36fa  KVM/VMX: Use BT+JNC, i.e. EFLAGS.CF to select VMRESUME vs. VMLAUNCH
b9a97767c6be8  KVM/VMX: Move VERW closer to VMentry for MDS mitigation
6e04cae36b8f5  x86/mmio: Disable KVM mitigation when X86_FEATURE_CLEAR_CPU_BUF is set
5fbd9f6c39532  Documentation/hw-vuln: Add documentation for RFDS
91cf85f753753  KVM/x86: Export RFDS_NO and RFDS_CLEAR to guests
a56b2033f152e  scsi: qla2xxx: Split FCE|EFT trace control
72ba168746d88  scsi: qla2xxx: Delay I/O Abort on PCI error
f49642661fe5e  PCI/DPC: Quirk PIO log size for Intel Ice Lake Root Ports
bb22d3689e047  scsi: lpfc: Correct size for wqe for memset()
10b1273d8a104  ixgbe: avoid sleeping allocation in ixgbe_ipsec_vf_add_sa()
85d11ded2d1de  scsi: sd: Fix wrong zone_write_granularity value during revalidate
39ed969a7a54b  soc: fsl: qbman: Add CGR update function        

Total patches: 293 - 73 - 51 = 169 
 
Link:https://gitee.com/openeuler/kernel/pulls/11079

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents d483f563 6a49567f
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@
&twsi1 {
	status = "okay";
	pmic: max8925@3c {
		compatible = "maxium,max8925";
		compatible = "maxim,max8925";
		reg = <0x3c>;
		interrupts = <1>;
		interrupt-parent = <&intcmux4>;
+2 −1
Original line number Diff line number Diff line
@@ -810,7 +810,8 @@ ap_spi_fp: &spi10 {
		vddrf-supply = <&pp1300_l2c>;
		vddch0-supply = <&pp3300_l10c>;
		max-speed = <3200000>;
		clocks = <&rpmhcc RPMH_RF_CLK2>;

		qcom,local-bd-address-broken;
	};
};

+10 −1
Original line number Diff line number Diff line
@@ -732,11 +732,20 @@
		status = "disabled";

		ports {
			hdmi_in: port {
			#address-cells = <1>;
			#size-cells = <0>;

			hdmi_in: port@0 {
				reg = <0>;

				hdmi_in_vop: endpoint {
					remote-endpoint = <&vop_out_hdmi>;
				};
			};

			hdmi_out: port@1 {
				reg = <1>;
			};
		};
	};

+10 −2
Original line number Diff line number Diff line
@@ -1769,6 +1769,7 @@
	hdmi: hdmi@ff940000 {
		compatible = "rockchip,rk3399-dw-hdmi";
		reg = <0x0 0xff940000 0x0 0x20000>;
		reg-io-width = <4>;
		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH 0>;
		clocks = <&cru PCLK_HDMI_CTRL>,
			 <&cru SCLK_HDMI_SFR>,
@@ -1777,13 +1778,16 @@
			 <&cru PLL_VPLL>;
		clock-names = "iahb", "isfr", "cec", "grf", "vpll";
		power-domains = <&power RK3399_PD_HDCP>;
		reg-io-width = <4>;
		rockchip,grf = <&grf>;
		#sound-dai-cells = <0>;
		status = "disabled";

		ports {
			hdmi_in: port {
			#address-cells = <1>;
			#size-cells = <0>;

			hdmi_in: port@0 {
				reg = <0>;
				#address-cells = <1>;
				#size-cells = <0>;

@@ -1796,6 +1800,10 @@
					remote-endpoint = <&vopl_out_hdmi>;
				};
			};

			hdmi_out: port@1 {
				reg = <1>;
			};
		};
	};

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ SECTIONS
	STABS_DEBUG
	DWARF_DEBUG
	ELF_DETAILS
	.hexagon.attributes 0 : { *(.hexagon.attributes) }

	DISCARDS
}
Loading