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

!13077 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.54-6.6.55 LTS Patches

Merge Pull Request from: @wenzhiwei11 
 
git log --oneline v6.6.54..v6.6.55 | wc -l
384
291+71+11+1+10

Merged(71):

static_call: Replace pointless WARN_ON() in static_call_module_notify()
net/mlx5e: Fix NULL deref in mlx5e_tir_builder_alloc()
net: add more sanity checks to qdisc_pkt_len_init()
net: avoid potential underflow in qdisc_pkt_len_init() with UFO
net: test for not too small csum_start in virtio_net_hdr_to_skb()
media: usbtv: Remove useless locks in usbtv_video_free()
Bluetooth: ISO: Fix not validating setsockopt user input
Bluetooth: L2CAP: Fix not validating setsockopt user input
cifs: Fix buffer overflow when parsing NFS reparse points
wifi: cfg80211: Set correct chandef when starting CAC
net/xen-netback: prevent UAF in xenvif_flush_hash()
blk_iocost: fix more out of bound shifts
wifi: ath12k: fix array out-of-bound access in SoC stats
tipc: guard against string buffer overrun
wifi: mwifiex: Fix memcpy() field-spanning write warning in mwifiex_cmd_802_11_scan_ext()
x86/ioapic: Handle allocation failures gracefully
ALSA: asihpi: Fix potential OOB array access
fbdev: pxafb: Fix possible use after free in pxafb_task()
drm/stm: Avoid use-after-free issues with crtc and plane
drm/amd/display: Handle null 'stream_status' in 'planes_changed_for_existing_stream'
drm/amdkfd: amdkfd_free_gtt_mem clear the correct pointer
drm/amd/display: fix double free issue during amdgpu module unload
jfs: Fix uaf in dbFreeBits
jfs: check if leafidx greater than num leaves per dmap tree
drm/msm/adreno: Assign msm_gpu->pdev earlier to avoid nullptrs
jfs: Fix uninit-value access of new_ea in ea_buffer
drm/amd/display: Initialize get_bytes_per_element's default to 1
drm/amd/display: Avoid overflow assignment in link_dp_cts
drm/amd/display: Fix index out of bounds in DCN30 color transformation
drm/amd/display: Check link_res->hpo_dp_link_enc before using it
drm/amd/display: Check stream before comparing them
ext4: fix i_data_sem unlock order in ext4_ind_migrate()
ext4: avoid use-after-free in ext4_ext_show_leaf()
ext4: ext4_search_dir should return a proper error
platform/x86: ISST: Fix the KASAN report slab-out-of-bounds bug
i2c: stm32f7: Do not prepare/unprepare clock during runtime suspend/resume
media: i2c: ar0521: Use cansleep version of gpiod_set_value()
ext4: no need to continue when the number of entries is 1
ext4: fix slab-use-after-free in ext4_split_extent_at()
ext4: update orig_path in ext4_find_extent()
ext4: fix timer use-after-free on failed mount
ext4: fix double brelse() the buffer of the extents path
ext4: aovid use-after-free in ext4_ext_insert_extent()
ext4: drop ppath from ext4_ext_replay_update_ex() to avoid double-free
drm: omapdrm: Add missing check for alloc_ordered_workqueue
jbd2: stop waiting for space when jbd2_cleanup_journal_tail() returns error
ocfs2: remove unreasonable unlock in ocfs2_read_blocks
ocfs2: cancel dqi_sync_work before freeing oinfo
ocfs2: reserve space for inline xattr before attaching reflink tree
ocfs2: fix possible null-ptr-deref in ocfs2_set_buffer_uptodate
exfat: fix memory leak in exfat_load_bitmap()
nfsd: map the EBADMSG to nfserr_io to avoid warning
i3c: master: svc: Fix use after free vulnerability in svc_i3c_master Driver Due to Race Condition
media: venus: fix use after free bug in venus_remove due to race condition
gso: fix udp gso fraglist segmentation after pull from frag_list
Input: adp5589-keys - fix NULL pointer dereference
cachefiles: fix dentry leak in cachefiles_open_file()
btrfs: fix a NULL pointer dereference when failed to start a new trasacntion
btrfs: wait for fixup workers before stopping cleaner kthread during umount
cpufreq: Avoid a bad reference count on CPU node
tracing/timerlat: Drop interface_lock in stop_kthread()
tracing/timerlat: Fix a race during cpuhp processing
drm/amd/display: Fix system hang while resume with TBT monitor
uprobes: fix kernel info leak via "[uprobes]" vma
r8169: Fix spelling mistake: "tx_underun" -> "tx_underrun"
r8169: add tally counter fields added with RTL8125
ACPI: battery: Simplify battery hook locking
ACPI: battery: Fix possible crash when unregistering a battery hook
efi/unaccepted: touch soft lockup during memory accept
net: stmmac: move the EST lock to struct stmmac_priv
null_blk: Fix return value of nullb_device_power_store()

conflicts(11)

drm/amd/display: Fix index out of bounds in degamma hardware format translation
iomap: handle a post-direct I/O invalidate race in iomap_write_delalloc_release
ext4: dax: fix overflowing extents beyond inode size when partially writing
arm64: Subscribe Microsoft Azure Cobalt 100 to erratum 3194386
arm64: errata: Expand speculative SSBS workaround once more
mm: z3fold: deprecate CONFIG_Z3FOLD
sched: psi: fix bogus pressure spikes from aggregation race
iommufd: Fix protection fault in iommufd_test_syz_conv_iova
null_blk: Remove usage of the deprecated ida_simple_xx() API
null_blk: fix null-ptr-dereference while configuring 'power' and 'submit_queues'
drm/amd/display: enable_hpo_dp_link_output: Check link_res->hpo_dp_link_enc before using it

checkconfig failed(1):

proc: add config & param to block forcing mem writes

checkkabi failed(10):

HID: Ignore battery for all ELAN I2C-HID devices
ata: sata_sil: Rename sil_blacklist to sil_quirks
ata: pata_serverworks: Do not use the term blacklist
drm/amd/display: Add null check for top_pipe_to_program in commit_planes_for_stream
scsi: aacraid: Rearrange order of struct aac_srb_unit
perf,x86: avoid missing caller address in stack traces captured in uprobe
i2c: synquacer: Deal with optional PCLK correctly
i2c: synquacer: Remove a clk reference from struct synquacer_i2c
i2c: core: Lock address during client device instantiation
i2c: create debugfs entry per adapter 
 
Link:https://gitee.com/openeuler/kernel/pulls/13077

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents ca3d9e6a bab72612
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ properties:
      and length of the AXI DMA controller IO space, unless
      axistream-connected is specified, in which case the reg
      attribute of the node referenced by it is used.
    minItems: 1
    maxItems: 2

  interrupts:
@@ -165,7 +166,7 @@ examples:
        clock-names = "s_axi_lite_clk", "axis_clk", "ref_clk", "mgt_clk";
        clocks = <&axi_clk>, <&axi_clk>, <&pl_enet_ref_clk>, <&mgt_clk>;
        phy-mode = "mii";
        reg = <0x00 0x40000000 0x00 0x40000>;
        reg = <0x40000000 0x40000>;
        xlnx,rxcsum = <0x2>;
        xlnx,rxmem = <0x800>;
        xlnx,txcsum = <0x2>;
+1 −1
Original line number Diff line number Diff line
@@ -711,7 +711,7 @@ static int __init aes_init(void)
		algname = aes_algs[i].base.cra_name + 2;
		drvname = aes_algs[i].base.cra_driver_name + 2;
		basename = aes_algs[i].base.cra_driver_name;
		simd = simd_skcipher_create_compat(algname, drvname, basename);
		simd = simd_skcipher_create_compat(aes_algs + i, algname, drvname, basename);
		err = PTR_ERR(simd);
		if (IS_ERR(simd))
			goto unregister_simds;
+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ static int __init aes_init(void)
		algname = aes_algs[i].base.cra_name + 2;
		drvname = aes_algs[i].base.cra_driver_name + 2;
		basename = aes_algs[i].base.cra_driver_name;
		simd = simd_skcipher_create_compat(algname, drvname, basename);
		simd = simd_skcipher_create_compat(aes_algs + i, algname, drvname, basename);
		err = PTR_ERR(simd);
		if (IS_ERR(simd))
			goto unregister_simds;
+2 −3
Original line number Diff line number Diff line
@@ -195,7 +195,8 @@ config ARM64
	select HAVE_DMA_CONTIGUOUS
	select HAVE_DYNAMIC_FTRACE
	select HAVE_DYNAMIC_FTRACE_WITH_ARGS \
		if $(cc-option,-fpatchable-function-entry=2)
		if (GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS || \
		    CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS)
	select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS \
		if DYNAMIC_FTRACE_WITH_ARGS && DYNAMIC_FTRACE_WITH_CALL_OPS
	select HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS \
@@ -268,12 +269,10 @@ config CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS
	def_bool CC_IS_CLANG
	# https://github.com/ClangBuiltLinux/linux/issues/1507
	depends on AS_IS_GNU || (AS_IS_LLVM && (LD_IS_LLD || LD_VERSION >= 23600))
	select HAVE_DYNAMIC_FTRACE_WITH_ARGS

config GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS
	def_bool CC_IS_GCC
	depends on $(cc-option,-fpatchable-function-entry=2)
	select HAVE_DYNAMIC_FTRACE_WITH_ARGS

config 64BIT
	def_bool y
+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@
#define ARM_CPU_PART_NEOVERSE_V3	0xD84
#define ARM_CPU_PART_CORTEX_X925	0xD85
#define ARM_CPU_PART_CORTEX_A725	0xD87
#define ARM_CPU_PART_NEOVERSE_N3	0xD8E

#define APM_CPU_PART_XGENE		0x000
#define APM_CPU_VAR_POTENZA		0x00
@@ -189,6 +190,7 @@
#define MIDR_NEOVERSE_V3 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_V3)
#define MIDR_CORTEX_X925 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X925)
#define MIDR_CORTEX_A725 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A725)
#define MIDR_NEOVERSE_N3 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N3)
#define MIDR_THUNDERX	MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX)
#define MIDR_THUNDERX_81XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_81XX)
#define MIDR_THUNDERX_83XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_83XX)
Loading