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

!11168 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.46-47 LTS Patches 

Merge Pull Request from: @anred 
 
git log --oneline v6.6.45..v6.6.47 | wc -l
259
222 + 15 + 22 = 259
Merged Before(15)
 wifi: cfg80211: restrict NL80211_ATTR_TXQ_QUANTUM values
 ext4: do not create EA inode under buffer lock
 ext4: fold quota accounting into ext4_xattr_inode_lookup_create()
 Bluetooth: RFCOMM: Fix not validating setsockopt user input
 jfs: Convert to bdev_open_by_dev()
 fs: Convert to bdev_open_by_dev()
 ASoC: topology: Fix route memory corruption
 exec: Fix ToCToU between perm check and set-uid/gid usage
 xfs: fix log recovery buffer allocation for the legacy h_size fixup
 netfilter: nf_tables: prefer nft_chain_validate
 sched/cputime: Fix mul_u64_u64_div_u64() precision for cputime
 md: do not delete safemode_timer in mddev_suspend
 net: usb: qmi_wwan: fix memory leak for not ip packets
 platform/x86/intel/ifs: Gen2 Scan test support
 platform/x86/intel/ifs: Store IFS generation number

Conflicts (22)
Linux 6.6.47
 cgroup: Move rcu_head up near the top of cgroup_root
 cgroup: Make operations on the cgroup root_list RCU safe
 mm: gup: stop abusing try_grab_folio
 ASoC: topology: Clean up route loading
 Linux 6.6.46
 mptcp: pm: fix backup support in signal endpoints
 sched/core: Fix unbalance set_rq_online/offline() in sched_cpu_deactivate()
 sched/core: Introduce sched_set_rq_on/offline() helper
 sched/smt: Fix unbalance sched_smt_present dec/inc
 sched/smt: Introduce sched_smt_present_inc/dec() helper
 btrfs: avoid using fixed char array size for tree names
 memcg: protect concurrent access to mem_cgroup_idr
 tracefs: Use generic inode RCU for synchronizing freeing
 ntp: Clamp maxerror and esterror to operating range
 arm64: errata: Expand speculative SSBS workaround (again)
 arm64: errata: Expand speculative SSBS workaround
 arm64: errata: Unify speculative SSBS errata logic
 arm64: errata: Add workaround for Arm errata 3194386 and 3312417
 profiling: remove profile=sleep support
 btrfs: do not clear page dirty inside extent_write_locked_range()
 irqchip/mbigen: Fix mbigen node address layout 
 
Link:https://gitee.com/openeuler/kernel/pulls/11168

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 41c1e56b b0385557

Documentation/admin-guide/cifs/usage.rst

+1 −1
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ SecurityFlags Flags which control security negotiation and 
			  may use NTLMSSP               		0x00080

			  must use NTLMSSP           			0x80080

			  seal (packet encryption)			0x00040

			  must seal (not implemented yet)               0x40040

			  must seal                                     0x40040



cifsFYI			If set to non-zero value, additional debug information

			will be logged to the system error log.  This field

Documentation/admin-guide/kernel-parameters.txt

+0 −6
Original line number Diff line number Diff line
@@ -671,12 +671,6 @@ 
			loops can be debugged more effectively on production

			systems.



	clocksource.max_cswd_read_retries= [KNL]

			Number of clocksource_watchdog() retries due to

			external delays before the clock will be marked

			unstable.  Defaults to two retries, that is,

			three attempts to read the clock under test.



	clocksource.verify_n_cpus= [KNL]

			Limit the number of CPUs checked for clocksources

			marked with CLOCK_SOURCE_VERIFY_PERCPU that

Documentation/bpf/map_lpm_trie.rst

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ significant byte. 


LPM tries may be created with a maximum prefix length that is a multiple

of 8, in the range from 8 to 2048. The key used for lookup and update

operations is a ``struct bpf_lpm_trie_key``, extended by

operations is a ``struct bpf_lpm_trie_key_u8``, extended by

``max_prefixlen/8`` bytes.



- For IPv4 addresses the data length is 4 bytes

Documentation/hwmon/corsair-psu.rst

+3 −3
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ Supported devices: 


  Corsair HX850i



  Corsair HX1000i (Series 2022 and 2023)

  Corsair HX1000i (Legacy and Series 2023)



  Corsair HX1200i

  Corsair HX1200i (Legacy and Series 2023)



  Corsair HX1500i (Series 2022 and 2023)

  Corsair HX1500i (Legacy and Series 2023)



  Corsair RM550i

Documentation/mm/page_table_check.rst

+8 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ Page table check performs extra verifications at the time when new pages become 
accessible from the userspace by getting their page table entries (PTEs PMDs

etc.) added into the table.



In case of detected corruption, the kernel is crashed. There is a small

In case of most detected corruption, the kernel is crashed. There is a small

performance and memory overhead associated with the page table check. Therefore,

it is disabled by default, but can be optionally enabled on systems where the

extra hardening outweighs the performance costs. Also, because page table check
@@ -22,6 +22,13 @@ is synchronous, it can help with debugging double map memory corruption issues, 
by crashing kernel at the time wrong mapping occurs instead of later which is

often the case with memory corruptions bugs.



It can also be used to do page table entry checks over various flags, dump

warnings when illegal combinations of entry flags are detected.  Currently,

userfaultfd is the only user of such to sanity check wr-protect bit against

any writable flags.  Illegal flag combinations will not directly cause data

corruption in this case immediately, but that will cause read-only data to

be writable, leading to corrupt when the page content is later modified.



Double mapping detection logic

==============================