- Kernel - mailweb.openeuler.org

[PATCH OLK-6.6] fs: export anon_inode_make_secure_inode() and fix secretmem LSM bypass
by Zhang Qilong 24 Jul '25

24 Jul '25

From: Shivank Garg <shivankg(a)amd.com> mainline inclusion from mainline-v6.16-rc5 commit cbe4134ea4bc493239786220bd69cb8a13493190 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICNXJB Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- fs: export anon_inode_make_secure_inode() and fix secretmem LSM bypass Export anon_inode_make_secure_inode() to allow KVM guest_memfd to create anonymous inodes with proper security context. This replaces the current pattern of calling alloc_anon_inode() followed by inode_init_security_anon() for creating security context manually. This change also fixes a security regression in secretmem where the S_PRIVATE flag was not cleared after alloc_anon_inode(), causing LSM/SELinux checks to be bypassed for secretmem file descriptors. As guest_memfd currently resides in the KVM module, we need to export this symbol for use outside the core kernel. In the future, guest_memfd might be moved to core-mm, at which point the symbols no longer would have to be exported. When/if that happens is still unclear. Fixes: 2bfe15c52612 ("mm: create security context for memfd_secret inodes") Suggested-by: David Hildenbrand <david(a)redhat.com> Suggested-by: Mike Rapoport <rppt(a)kernel.org> Signed-off-by: Shivank Garg <shivankg(a)amd.com> Link: https://lore.kernel.org/20250620070328.803704-3-shivankg@amd.com Acked-by: "Mike Rapoport (Microsoft)" <rppt(a)kernel.org> Signed-off-by: Christian Brauner <brauner(a)kernel.org> Conflicts: fs/anon_inodes.c include/linux/fs.h mm/secretmem.c [ The pre-refactoring commit e7e832ce6fa76 ("fs: add LSM-supporting anon-inode interface") and the supporting anon_inode_operations were not merged, resulting in significant conflicts. This patch primarily addresses the issue of cleaning up the private field to prevent permission check bypass. In this backport, the issue is directly fixed in secretmem_file_create. ] Reviewed-by: Nanyong Sun <sunnanyong(a)huawei.com> Signed-off-by: Zhang Qilong <zhangqilong3(a)huawei.com> --- mm/secretmem.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mm/secretmem.c b/mm/secretmem.c index 399552814fd0..88fbd3598207 100644 --- a/mm/secretmem.c +++ b/mm/secretmem.c @@ -200,10 +200,15 @@ static struct file *secretmem_file_create(unsigned long flags) inode = alloc_anon_inode(secretmem_mnt->mnt_sb); if (IS_ERR(inode)) return ERR_CAST(inode); + /* + * Not clear S_PRIVATE may cause LSM/SELinux checks to be + * bypassed for secretmem file descriptors. + */ + inode->i_flags &= ~S_PRIVATE; err = security_inode_init_security_anon(inode, &qname, NULL); if (err) { file = ERR_PTR(err); goto err_free_inode; } -- 2.43.0

2 1

[PATCH openEuler-1.0-LTS 0/2] estimation_timer adjust
by Xiangwei Li 24 Jul '25

24 Jul '25

Add sysctl_run_estimation and sysctl_run_estimation_target to control execution of the est_timer callback in ipvs. sysctl_run_estimation If disabled, the estimation will be stop, and you can't see any update on speed estimation data. sysctl_run_estimation_target If not -1, the estimation running on the target CPU. Dust Li (1): ipvs: add sysctl_run_estimation to support disable estimation Orange9887 (1): ipvs: add sysctl_run_estimation_target to support estimation select CPU Documentation/networking/ipvs-sysctl.txt | 20 +++++++++++++ include/net/ip_vs.h | 22 ++++++++++++++ net/netfilter/ipvs/ip_vs_ctl.c | 38 ++++++++++++++++++++++++ net/netfilter/ipvs/ip_vs_est.c | 16 +++++++++- 4 files changed, 95 insertions(+), 1 deletion(-) -- 2.25.1

2 3

[PATCH] fs: export anon_inode_make_secure_inode() and fix secretmem LSM bypass
by Zhang Qilong 24 Jul '25

24 Jul '25

From: Shivank Garg <shivankg(a)amd.com> mainline inclusion from mainline-v6.16-rc5 commit cbe4134ea4bc493239786220bd69cb8a13493190 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICNXJB Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- fs: export anon_inode_make_secure_inode() and fix secretmem LSM bypass Export anon_inode_make_secure_inode() to allow KVM guest_memfd to create anonymous inodes with proper security context. This replaces the current pattern of calling alloc_anon_inode() followed by inode_init_security_anon() for creating security context manually. This change also fixes a security regression in secretmem where the S_PRIVATE flag was not cleared after alloc_anon_inode(), causing LSM/SELinux checks to be bypassed for secretmem file descriptors. As guest_memfd currently resides in the KVM module, we need to export this symbol for use outside the core kernel. In the future, guest_memfd might be moved to core-mm, at which point the symbols no longer would have to be exported. When/if that happens is still unclear. Fixes: 2bfe15c52612 ("mm: create security context for memfd_secret inodes") Suggested-by: David Hildenbrand <david(a)redhat.com> Suggested-by: Mike Rapoport <rppt(a)kernel.org> Signed-off-by: Shivank Garg <shivankg(a)amd.com> Link: https://lore.kernel.org/20250620070328.803704-3-shivankg@amd.com Acked-by: "Mike Rapoport (Microsoft)" <rppt(a)kernel.org> Signed-off-by: Christian Brauner <brauner(a)kernel.org> Conflicts: fs/anon_inodes.c include/linux/fs.h mm/secretmem.c [ The pre-refactoring commit e7e832ce6fa76 ("fs: add LSM-supporting anon-inode interface") and the supporting anon_inode_operations were not merged, resulting in significant conflicts. This patch primarily addresses the issue of cleaning up the private field to prevent permission check bypass. In this backport, the issue is directly fixed in secretmem_file_create. ] Reviewed-by: Nanyong Sun <sunnanyong(a)huawei.com> Signed-off-by: Zhang Qilong <zhangqilong3(a)huawei.com> --- mm/secretmem.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mm/secretmem.c b/mm/secretmem.c index 399552814fd0..88fbd3598207 100644 --- a/mm/secretmem.c +++ b/mm/secretmem.c @@ -200,10 +200,15 @@ static struct file *secretmem_file_create(unsigned long flags) inode = alloc_anon_inode(secretmem_mnt->mnt_sb); if (IS_ERR(inode)) return ERR_CAST(inode); + /* + * Not clear S_PRIVATE may cause LSM/SELinux checks to be + * bypassed for secretmem file descriptors. + */ + inode->i_flags &= ~S_PRIVATE; err = security_inode_init_security_anon(inode, &qname, NULL); if (err) { file = ERR_PTR(err); goto err_free_inode; } -- 2.43.0

1 0

[PATCH OLK-6.6] atm: Revert atm_account_tx() if copy_from_iter_full() fails.
by Ziming Du 24 Jul '25

24 Jul '25

From: Kuniyuki Iwashima <kuniyu(a)google.com> stable inclusion from stable-v6.6.95 commit 3902205eadf35db59dbc2186c2a98b9e6182efa5 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/ICK4OK CVE: CVE-2025-38190 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… ------------------------------- commit 7851263998d4269125fd6cb3fdbfc7c6db853859 upstream. In vcc_sendmsg(), we account skb->truesize to sk->sk_wmem_alloc by atm_account_tx(). It is expected to be reverted by atm_pop_raw() later called by vcc->dev->ops->send(vcc, skb). However, vcc_sendmsg() misses the same revert when copy_from_iter_full() fails, and then we will leak a socket. Let's factorise the revert part as atm_return_tx() and call it in the failure path. Note that the corresponding sk_wmem_alloc operation can be found in alloc_tx() as of the blamed commit. $ git blame -L:alloc_tx net/atm/common.c c55fa3cccbc2c~ Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Reported-by: Simon Horman <horms(a)kernel.org> Closes: https://lore.kernel.org/netdev/20250614161959.GR414686@horms.kernel.org/ Signed-off-by: Kuniyuki Iwashima <kuniyu(a)google.com> Link: https://patch.msgid.link/20250616182147.963333-3-kuni1840@gmail.com Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Ziming Du <duziming2(a)huawei.com> --- include/linux/atmdev.h | 6 ++++++ net/atm/common.c | 1 + net/atm/raw.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h index 9b02961d65ee..45f2f278b50a 100644 --- a/include/linux/atmdev.h +++ b/include/linux/atmdev.h @@ -249,6 +249,12 @@ static inline void atm_account_tx(struct atm_vcc *vcc, struct sk_buff *skb) ATM_SKB(skb)->atm_options = vcc->atm_options; } +static inline void atm_return_tx(struct atm_vcc *vcc, struct sk_buff *skb) +{ + WARN_ON_ONCE(refcount_sub_and_test(ATM_SKB(skb)->acct_truesize, + &sk_atm(vcc)->sk_wmem_alloc)); +} + static inline void atm_force_charge(struct atm_vcc *vcc,int truesize) { atomic_add(truesize, &sk_atm(vcc)->sk_rmem_alloc); diff --git a/net/atm/common.c b/net/atm/common.c index f7019df41c3e..9cc82acbc735 100644 --- a/net/atm/common.c +++ b/net/atm/common.c @@ -635,6 +635,7 @@ int vcc_sendmsg(struct socket *sock, struct msghdr *m, size_t size) skb->dev = NULL; /* for paths shared with net_device interfaces */ if (!copy_from_iter_full(skb_put(skb, size), size, &m->msg_iter)) { + atm_return_tx(vcc, skb); kfree_skb(skb); error = -EFAULT; goto out; diff --git a/net/atm/raw.c b/net/atm/raw.c index 2b5f78a7ec3e..1e6511ec842c 100644 --- a/net/atm/raw.c +++ b/net/atm/raw.c @@ -36,7 +36,7 @@ static void atm_pop_raw(struct atm_vcc *vcc, struct sk_buff *skb) pr_debug("(%d) %d -= %d\n", vcc->vci, sk_wmem_alloc_get(sk), ATM_SKB(skb)->acct_truesize); - WARN_ON(refcount_sub_and_test(ATM_SKB(skb)->acct_truesize, &sk->sk_wmem_alloc)); + atm_return_tx(vcc, skb); dev_kfree_skb_any(skb); sk->sk_write_space(sk); } -- 2.43.0

2 1

[PATCH OLK-6.6 00/11] LoongArch: fix nvme/megaraid/stmmac/uprobe/rtc/kdump problems
by Hongchen Zhang 24 Jul '25

24 Jul '25

Hongchen Zhang (1): LoongArch: configs: enable zstd compressed firmware support Huacai Chen (1): LoongArch: Add debugfs entries to switch SFB/TSO state Ming Wang (3): Loongarch: configs: Make EFI RTC built-in for correct vmcore timestamps LoongArch: Reserve the EFI memory map region LoongArch: Support mem=<size> kernel parameter Tiezhu Yang (2): LoongArch: uprobes: Remove user_{en,dis}able_single_step() LoongArch: uprobes: Remove redundant code about resume_era mengxiangdong (1): net: stmmac: dwmac-loongson: Set correct {tx,rx}_fifo_size wanghongliang (1): LoongArch: fix access mode of 7A2000 acpi gpio. zhangtianyang (2): nvme: Add udelay to avoid data error caused by dma sequence megaraid: Add udelay to avoid data error caused by dma sequence arch/loongarch/configs/loongson3_defconfig | 3 +- arch/loongarch/include/asm/loongarch.h | 21 +++ arch/loongarch/include/asm/uprobes.h | 1 - arch/loongarch/kernel/Makefile | 2 +- arch/loongarch/kernel/efi.c | 12 ++ arch/loongarch/kernel/kdebugfs.c | 171 ++++++++++++++++++ arch/loongarch/kernel/setup.c | 18 +- arch/loongarch/kernel/unaligned.c | 8 +- arch/loongarch/kernel/uprobes.c | 11 +- drivers/gpio/gpio-loongson-64bit.c | 8 +- .../ethernet/stmicro/stmmac/dwmac-loongson.c | 3 + drivers/nvme/host/pci.c | 11 ++ drivers/scsi/megaraid/megaraid_sas_fusion.c | 8 +- 13 files changed, 245 insertions(+), 32 deletions(-) create mode 100644 arch/loongarch/kernel/kdebugfs.c -- 2.33.0

2 12

[PATCH OLK-6.6 00/11] LoongArch: fix nvme/megaraid/stmmac/uprobe/rtc/kdump problems
by Hongchen Zhang 24 Jul '25

24 Jul '25

Hongchen Zhang (1): LoongArch: configs: enable zstd compressed firmware support Huacai Chen (1): LoongArch: Add debugfs entries to switch SFB/TSO state Ming Wang (3): Loongarch: configs: Make EFI RTC built-in for correct vmcore timestamps LoongArch: Reserve the EFI memory map region LoongArch: Support mem=<size> kernel parameter Tiezhu Yang (2): LoongArch: uprobes: Remove user_{en,dis}able_single_step() LoongArch: uprobes: Remove redundant code about resume_era mengxiangdong (1): net: stmmac: dwmac-loongson: Set correct {tx,rx}_fifo_size wanghongliang (1): LoongArch: fix access mode of 7A2000 acpi gpio. zhangtianyang (2): nvme: Add udelay to avoid data error caused by dma sequence megaraid: Add udelay to avoid data error caused by dma sequence arch/loongarch/configs/loongson3_defconfig | 3 +- arch/loongarch/include/asm/loongarch.h | 21 +++ arch/loongarch/include/asm/uprobes.h | 1 - arch/loongarch/kernel/Makefile | 2 +- arch/loongarch/kernel/efi.c | 12 ++ arch/loongarch/kernel/kdebugfs.c | 171 ++++++++++++++++++ arch/loongarch/kernel/setup.c | 18 +- arch/loongarch/kernel/unaligned.c | 8 +- arch/loongarch/kernel/uprobes.c | 11 +- drivers/gpio/gpio-loongson-64bit.c | 8 +- .../ethernet/stmicro/stmmac/dwmac-loongson.c | 3 + drivers/nvme/host/pci.c | 11 ++ drivers/scsi/megaraid/megaraid_sas_fusion.c | 8 +- 13 files changed, 245 insertions(+), 32 deletions(-) create mode 100644 arch/loongarch/kernel/kdebugfs.c -- 2.33.0

2 13

[PATCH OLK-6.6 0/3] LoongArch: add TPM/SM3/SM4/EDAC support
by Hongchen Zhang 24 Jul '25

24 Jul '25

Qunqin Zhao (3): tpm: Add a driver for Loongson TPM device crypto: loongson: add loongson sm3 and ecb(sm4) support EDAC: Add an EDAC driver for the Loongson memory controller MAINTAINERS | 11 + arch/loongarch/Kconfig | 1 + arch/loongarch/configs/loongson3_defconfig | 7 + drivers/char/Kconfig | 12 +- drivers/char/Makefile | 1 - drivers/char/loongson_se.c | 523 -------------------- drivers/char/lsse_sdf_cdev.c | 95 ++-- drivers/char/tpm/Kconfig | 9 + drivers/char/tpm/Makefile | 1 + drivers/char/tpm/tpm_loongson.c | 84 ++++ drivers/crypto/Kconfig | 1 + drivers/crypto/Makefile | 1 + drivers/crypto/loongson/Kconfig | 31 ++ drivers/crypto/loongson/Makefile | 3 + drivers/crypto/loongson/loongson-hash.c | 312 ++++++++++++ drivers/crypto/loongson/loongson-rng.c | 209 ++++++++ drivers/crypto/loongson/loongson-skcipher.c | 248 ++++++++++ drivers/edac/Kconfig | 9 + drivers/edac/Makefile | 1 + drivers/edac/loongson_edac.c | 152 ++++++ drivers/mfd/Kconfig | 11 + drivers/mfd/Makefile | 2 + drivers/mfd/loongson-se.c | 256 ++++++++++ include/linux/mfd/loongson-se.h | 59 +++ include/soc/loongson/se.h | 1 + 25 files changed, 1439 insertions(+), 601 deletions(-) delete mode 100644 drivers/char/loongson_se.c create mode 100644 drivers/char/tpm/tpm_loongson.c create mode 100644 drivers/crypto/loongson/Kconfig create mode 100644 drivers/crypto/loongson/Makefile create mode 100644 drivers/crypto/loongson/loongson-hash.c create mode 100644 drivers/crypto/loongson/loongson-rng.c create mode 100644 drivers/crypto/loongson/loongson-skcipher.c create mode 100644 drivers/edac/loongson_edac.c create mode 100644 drivers/mfd/loongson-se.c create mode 100644 include/linux/mfd/loongson-se.h -- 2.33.0

2 4

[PATCH OLK-6.6 00/11] LoongArch: fix nvme/megaraid/stmmac/uprobe/rtc/kdump problems
by Hongchen Zhang 24 Jul '25

24 Jul '25

Hongchen Zhang (1): LoongArch: configs: enable zstd compressed firwmare support Huacai Chen (1): LoongArch: Add debugfs entries to switch SFB/TSO state Ming Wang (3): Loongarch: configs: Make EFI RTC built-in for correct vmcore timestamps LoongArch: Reserve the EFI memory map region LoongArch: Support mem=<size> kernel parameter Tiezhu Yang (2): LoongArch: uprobes: Remove user_{en,dis}able_single_step() LoongArch: uprobes: Remove redundant code about resume_era mengxiangdong (1): net: stmmac: dwmac-loongson: Set correct {tx,rx}_fifo_size wanghongliang (1): LoongArch: fix access mode of 7A2000 acpi gpio. zhangtianyang (2): nvme: Add udelay to avoid data error caused by dma sequence megaraid: Add udelay to avoid data error caused by dma sequence arch/loongarch/configs/loongson3_defconfig | 3 +- arch/loongarch/include/asm/loongarch.h | 21 +++ arch/loongarch/include/asm/uprobes.h | 1 - arch/loongarch/kernel/Makefile | 2 +- arch/loongarch/kernel/efi.c | 12 ++ arch/loongarch/kernel/kdebugfs.c | 171 ++++++++++++++++++ arch/loongarch/kernel/setup.c | 18 +- arch/loongarch/kernel/unaligned.c | 8 +- arch/loongarch/kernel/uprobes.c | 11 +- drivers/gpio/gpio-loongson-64bit.c | 8 +- .../ethernet/stmicro/stmmac/dwmac-loongson.c | 3 + drivers/nvme/host/pci.c | 11 ++ drivers/scsi/megaraid/megaraid_sas_fusion.c | 8 +- 13 files changed, 245 insertions(+), 32 deletions(-) create mode 100644 arch/loongarch/kernel/kdebugfs.c -- 2.33.0

2 12

[PATCH openEuler-1.0-LTS] mpls: Use rcu_dereference_rtnl() in mpls_route_input_rcu().
by Jiacheng Yu 24 Jul '25

24 Jul '25

From: Kuniyuki Iwashima <kuniyu(a)google.com> stable inclusion from stable-v5.10.240 commit 36af82f25fbdcd719eb947c15ea874bf80bcf229 category: bufgix bugzilla: https://gitee.com/src-openeuler/kernel/issues/ICLHWJ CVE: CVE-2025-38324 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- [ Upstream commit 6dbb0d97c5096072c78a6abffe393584e57ae945 ] As syzbot reported [0], mpls_route_input_rcu() can be called from mpls_getroute(), where is under RTNL. net->mpls.platform_label is only updated under RTNL. Let's use rcu_dereference_rtnl() in mpls_route_input_rcu() to silence the splat. [0]: WARNING: suspicious RCU usage 6.15.0-rc7-syzkaller-00082-g5cdb2c77c4c3 #0 Not tainted ---------------------------- net/mpls/af_mpls.c:84 suspicious rcu_dereference_check() usage! other info that might help us debug this: rcu_scheduler_active = 2, debug_locks = 1 1 lock held by syz.2.4451/17730: #0: ffffffff9012a3e8 (rtnl_mutex){+.+.}-{4:4}, at: rtnl_lock net/core/rtnetlink.c:80 [inline] #0: ffffffff9012a3e8 (rtnl_mutex){+.+.}-{4:4}, at: rtnetlink_rcv_msg+0x371/0xe90 net/core/rtnetlink.c:6961 stack backtrace: CPU: 1 UID: 0 PID: 17730 Comm: syz.2.4451 Not tainted 6.15.0-rc7-syzkaller-00082-g5cdb2c77c4c3 #0 PREEMPT(full) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/07/2025 Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x16c/0x1f0 lib/dump_stack.c:120 lockdep_rcu_suspicious+0x166/0x260 kernel/locking/lockdep.c:6865 mpls_route_input_rcu+0x1d4/0x200 net/mpls/af_mpls.c:84 mpls_getroute+0x621/0x1ea0 net/mpls/af_mpls.c:2381 rtnetlink_rcv_msg+0x3c9/0xe90 net/core/rtnetlink.c:6964 netlink_rcv_skb+0x16d/0x440 net/netlink/af_netlink.c:2534 netlink_unicast_kernel net/netlink/af_netlink.c:1313 [inline] netlink_unicast+0x53a/0x7f0 net/netlink/af_netlink.c:1339 netlink_sendmsg+0x8d1/0xdd0 net/netlink/af_netlink.c:1883 sock_sendmsg_nosec net/socket.c:712 [inline] __sock_sendmsg net/socket.c:727 [inline] ____sys_sendmsg+0xa98/0xc70 net/socket.c:2566 ___sys_sendmsg+0x134/0x1d0 net/socket.c:2620 __sys_sendmmsg+0x200/0x420 net/socket.c:2709 __do_sys_sendmmsg net/socket.c:2736 [inline] __se_sys_sendmmsg net/socket.c:2733 [inline] __x64_sys_sendmmsg+0x9c/0x100 net/socket.c:2733 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xcd/0x230 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f0a2818e969 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 a8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f0a28f52038 EFLAGS: 00000246 ORIG_RAX: 0000000000000133 RAX: ffffffffffffffda RBX: 00007f0a283b5fa0 RCX: 00007f0a2818e969 RDX: 0000000000000003 RSI: 0000200000000080 RDI: 0000000000000003 RBP: 00007f0a28210ab1 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 0000000000000000 R14: 00007f0a283b5fa0 R15: 00007ffce5e9f268 </TASK> Fixes: 0189197f4416 ("mpls: Basic routing support") Reported-by: syzbot+8a583bdd1a5cc0b0e068(a)syzkaller.appspotmail.com Closes: https://lore.kernel.org/netdev/68507981.a70a0220.395abc.01ef.GAE@google.com/ Signed-off-by: Kuniyuki Iwashima <kuniyu(a)google.com> Link: https://patch.msgid.link/20250616201532.1036568-1-kuni1840@gmail.com Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Jiacheng Yu <yujiacheng3(a)huawei.com> --- net/mpls/af_mpls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index c7fd387baa61..f8d7a0b12926 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -81,8 +81,8 @@ static struct mpls_route *mpls_route_input_rcu(struct net *net, unsigned index) if (index < net->mpls.platform_labels) { struct mpls_route __rcu **platform_label = - rcu_dereference(net->mpls.platform_label); - rt = rcu_dereference(platform_label[index]); + rcu_dereference_rtnl(net->mpls.platform_label); + rt = rcu_dereference_rtnl(platform_label[index]); } return rt; } -- 2.43.0

2 1

[PATCH OLK-6.6 v2] ifs: Defer cgroup ifs enable
by Pu Lehui 24 Jul '25

24 Jul '25

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ICAOAT -------------------------------- Start cgroup ifs after the kernel core startup process is completed, otherwise the intermediate state may be accessed. Fixes: 805b20db8a88 ("interference: Add cgroup-based inteference statistics framework") Signed-off-by: Pu Lehui <pulehui(a)huawei.com> --- kernel/cgroup/ifs.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/kernel/cgroup/ifs.c b/kernel/cgroup/ifs.c index 6243c9a98ffe..e6419899d725 100644 --- a/kernel/cgroup/ifs.c +++ b/kernel/cgroup/ifs.c @@ -537,15 +537,13 @@ void cgroup_ifs_init(void) BUG_ON(cgroup_init_cftypes(NULL, cgroup_ifs_files)); cgroup_ifs_tdesc_init(); - - static_branch_enable(&cgrp_ifs_enabled); } int cgroup_ifs_add_files(struct cgroup_subsys_state *css, struct cgroup *cgrp) { int ret = 0; - if (!cgroup_ifs_enabled()) + if (!ifs_enable) return 0; ret = cgroup_addrm_files(css, cgrp, cgroup_ifs_files, true); @@ -559,7 +557,7 @@ int cgroup_ifs_add_files(struct cgroup_subsys_state *css, struct cgroup *cgrp) void cgroup_ifs_rm_files(struct cgroup_subsys_state *css, struct cgroup *cgrp) { - if (cgroup_ifs_enabled()) + if (ifs_enable) cgroup_addrm_files(css, cgrp, cgroup_ifs_files, false); } @@ -576,3 +574,16 @@ void cgroup_ifs_enable_irq_account(bool enable) ifs_irq_enable = enable; } #endif + +static __init int cgroup_ifs_enable(void) +{ + if (!ifs_enable) + return 0; + + if (!this_cpu_read(ifs_tsc_freq)) + return 0; + + static_branch_enable(&cgrp_ifs_enabled); + return 0; +} +late_initcall_sync(cgroup_ifs_enable); -- 2.34.1

2 1