January 2024 - Kernel - mailweb.openeuler.org

[PATCH OLK-6.6] ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16()
by ZhaoLong Wang 29 Jan '24

29 Jan '24

From: Namjae Jeon <linkinjeon(a)kernel.org> mainline inclusion from mainline-v6.7-rc8 commit d10c77873ba1e9e6b91905018e29e196fd5f863d category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8YD63 CVE: CVE-2024-22705 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- If ->NameOffset/Length is bigger than ->CreateContextsOffset/Length, ksmbd_check_message doesn't validate request buffer it correctly. So slab-out-of-bounds warning from calling smb_strndup_from_utf16() in smb2_open() could happen. If ->NameLength is non-zero, Set the larger of the two sums (Name and CreateContext size) as the offset and length of the data area. Reported-by: Yang Chaoming <lometsj(a)live.com> Cc: stable(a)vger.kernel.org Signed-off-by: Namjae Jeon <linkinjeon(a)kernel.org> Signed-off-by: Steve French <stfrench(a)microsoft.com> Signed-off-by: ZhaoLong Wang <wangzhaolong1(a)huawei.com> --- fs/smb/server/smb2misc.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/fs/smb/server/smb2misc.c b/fs/smb/server/smb2misc.c index 23bd3d1209df..03dded29a980 100644 --- a/fs/smb/server/smb2misc.c +++ b/fs/smb/server/smb2misc.c @@ -106,16 +106,25 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len, break; case SMB2_CREATE: { + unsigned short int name_off = + le16_to_cpu(((struct smb2_create_req *)hdr)->NameOffset); + unsigned short int name_len = + le16_to_cpu(((struct smb2_create_req *)hdr)->NameLength); + if (((struct smb2_create_req *)hdr)->CreateContextsLength) { *off = le32_to_cpu(((struct smb2_create_req *) hdr)->CreateContextsOffset); *len = le32_to_cpu(((struct smb2_create_req *) hdr)->CreateContextsLength); - break; + if (!name_len) + break; + + if (name_off + name_len < (u64)*off + *len) + break; } - *off = le16_to_cpu(((struct smb2_create_req *)hdr)->NameOffset); - *len = le16_to_cpu(((struct smb2_create_req *)hdr)->NameLength); + *off = name_off; + *len = name_len; break; } case SMB2_QUERY_INFO: -- 2.34.3

2 1

[PATCH OLK-5.10] ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16()
by ZhaoLong Wang 29 Jan '24

29 Jan '24

From: Namjae Jeon <linkinjeon(a)kernel.org> mainline inclusion from mainline-v6.7-rc8 commit d10c77873ba1e9e6b91905018e29e196fd5f863d category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8YD63 CVE: CVE-2024-22705 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… -------------------------------- If ->NameOffset/Length is bigger than ->CreateContextsOffset/Length, ksmbd_check_message doesn't validate request buffer it correctly. So slab-out-of-bounds warning from calling smb_strndup_from_utf16() in smb2_open() could happen. If ->NameLength is non-zero, Set the larger of the two sums (Name and CreateContext size) as the offset and length of the data area. Reported-by: Yang Chaoming <lometsj(a)live.com> Cc: stable(a)vger.kernel.org Signed-off-by: Namjae Jeon <linkinjeon(a)kernel.org> Signed-off-by: Steve French <stfrench(a)microsoft.com> Signed-off-by: ZhaoLong Wang <wangzhaolong1(a)huawei.com> --- fs/ksmbd/smb2misc.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/fs/ksmbd/smb2misc.c b/fs/ksmbd/smb2misc.c index 41170a593acf..caf6739530e1 100644 --- a/fs/ksmbd/smb2misc.c +++ b/fs/ksmbd/smb2misc.c @@ -107,16 +107,25 @@ static int smb2_get_data_area_len(unsigned int *off, unsigned int *len, break; case SMB2_CREATE: { + unsigned short int name_off = + le16_to_cpu(((struct smb2_create_req *)hdr)->NameOffset); + unsigned short int name_len = + le16_to_cpu(((struct smb2_create_req *)hdr)->NameLength); + if (((struct smb2_create_req *)hdr)->CreateContextsLength) { *off = le32_to_cpu(((struct smb2_create_req *) hdr)->CreateContextsOffset); *len = le32_to_cpu(((struct smb2_create_req *) hdr)->CreateContextsLength); - break; + if (!name_len) + break; + + if (name_off + name_len < (u64)*off + *len) + break; } - *off = le16_to_cpu(((struct smb2_create_req *)hdr)->NameOffset); - *len = le16_to_cpu(((struct smb2_create_req *)hdr)->NameLength); + *off = name_off; + *len = name_len; break; } case SMB2_QUERY_INFO: -- 2.34.3

2 1

[openeuler:OLK-6.6] BUILD REGRESSION 6e92c8c8b1bba4cc649d5fb8f7e784aa47ec19c6
by kernel test robot 29 Jan '24

29 Jan '24

tree/branch: https://gitee.com/openeuler/kernel.git OLK-6.6 branch HEAD: 6e92c8c8b1bba4cc649d5fb8f7e784aa47ec19c6 !3774 [OLK-6.6] sched/fair: Scan cluster before scanning LLC in wake-up path Error/Warning ids grouped by kconfigs: clang_recent_errors |-- arm64-randconfig-001-20240128 | |-- kernel-sched-core.c:error:call-to-undeclared-function-init_auto_affinity-ISO-C99-and-later-do-not-support-implicit-function-declarations | |-- kernel-sched-core.c:error:call-to-undeclared-function-tg_update_affinity_domains-ISO-C99-and-later-do-not-support-implicit-function-declarations | |-- mm-memblock.c:warning:expecting-prototype-for-memblock_alloc_internal().-Prototype-was-for-__memblock_alloc_internal()-instead | |-- mm-memblock.c:warning:no-previous-prototype-for-function-memblock_alloc_range_nid_flags | |-- mm-oom_kill.c:warning:Function-parameter-or-member-oc-not-described-in-oom_next_task | |-- mm-oom_kill.c:warning:Function-parameter-or-member-points-not-described-in-oom_next_task | |-- mm-oom_kill.c:warning:Function-parameter-or-member-task-not-described-in-oom_next_task | |-- mm-oom_kill.c:warning:expecting-prototype-for-We-choose-the-task-in-low().-Prototype-was-for-oom_next_task()-instead | `-- mm-vmalloc.c:warning:Function-parameter-or-member-pgoff-not-described-in-remap_vmalloc_hugepage_range_partial |-- arm64-randconfig-002-20240128 | |-- kernel-sched-core.c:error:call-to-undeclared-function-init_auto_affinity-ISO-C99-and-later-do-not-support-implicit-function-declarations | |-- kernel-sched-core.c:error:call-to-undeclared-function-tg_update_affinity_domains-ISO-C99-and-later-do-not-support-implicit-function-declarations | |-- mm-madvise.c:warning:no-previous-prototype-for-function-force_swapin_vma | |-- mm-memblock.c:warning:expecting-prototype-for-memblock_alloc_internal().-Prototype-was-for-__memblock_alloc_internal()-instead | |-- mm-memblock.c:warning:no-previous-prototype-for-function-memblock_alloc_range_nid_flags | |-- mm-oom_kill.c:warning:Function-parameter-or-member-oc-not-described-in-oom_next_task | |-- mm-oom_kill.c:warning:Function-parameter-or-member-points-not-described-in-oom_next_task | |-- mm-oom_kill.c:warning:Function-parameter-or-member-task-not-described-in-oom_next_task | |-- mm-oom_kill.c:warning:expecting-prototype-for-We-choose-the-task-in-low().-Prototype-was-for-oom_next_task()-instead | `-- mm-vmalloc.c:warning:Function-parameter-or-member-pgoff-not-described-in-remap_vmalloc_hugepage_range_partial |-- arm64-randconfig-003-20240128 | |-- mm-memblock.c:warning:expecting-prototype-for-memblock_alloc_internal().-Prototype-was-for-__memblock_alloc_internal()-instead | |-- mm-memblock.c:warning:no-previous-prototype-for-function-memblock_alloc_range_nid_flags | |-- mm-oom_kill.c:warning:Function-parameter-or-member-oc-not-described-in-oom_next_task | |-- mm-oom_kill.c:warning:Function-parameter-or-member-points-not-described-in-oom_next_task | |-- mm-oom_kill.c:warning:Function-parameter-or-member-task-not-described-in-oom_next_task | |-- mm-oom_kill.c:warning:expecting-prototype-for-We-choose-the-task-in-low().-Prototype-was-for-oom_next_task()-instead | `-- mm-vmalloc.c:warning:Function-parameter-or-member-pgoff-not-described-in-remap_vmalloc_hugepage_range_partial `-- arm64-randconfig-004-20240128 |-- kernel-sched-core.c:error:call-to-undeclared-function-init_auto_affinity-ISO-C99-and-later-do-not-support-implicit-function-declarations |-- kernel-sched-core.c:error:call-to-undeclared-function-tg_update_affinity_domains-ISO-C99-and-later-do-not-support-implicit-function-declarations |-- mm-madvise.c:warning:no-previous-prototype-for-function-force_swapin_vma |-- mm-memblock.c:warning:expecting-prototype-for-memblock_alloc_internal().-Prototype-was-for-__memblock_alloc_internal()-instead |-- mm-memblock.c:warning:no-previous-prototype-for-function-memblock_alloc_range_nid_flags |-- mm-oom_kill.c:warning:Function-parameter-or-member-oc-not-described-in-oom_next_task |-- mm-oom_kill.c:warning:Function-parameter-or-member-points-not-described-in-oom_next_task |-- mm-oom_kill.c:warning:Function-parameter-or-member-task-not-described-in-oom_next_task |-- mm-oom_kill.c:warning:expecting-prototype-for-We-choose-the-task-in-low().-Prototype-was-for-oom_next_task()-instead `-- mm-vmalloc.c:warning:Function-parameter-or-member-pgoff-not-described-in-remap_vmalloc_hugepage_range_partial elapsed time: 2188m configs tested: 4 configs skipped: 65 tested configs: arm64 randconfig-001-20240128 clang arm64 randconfig-002-20240128 clang arm64 randconfig-003-20240128 clang arm64 randconfig-004-20240128 clang -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:OLK-5.10] BUILD REGRESSION bb2503a5fcdf7f51d403ab34440c497acef3b4e7
by kernel test robot 28 Jan '24

28 Jan '24

tree/branch: https://gitee.com/openeuler/kernel.git OLK-5.10 branch HEAD: bb2503a5fcdf7f51d403ab34440c497acef3b4e7 !4149 block: remove precise_iostat Error/Warning: (recently discovered and may have been fixed) drivers/crypto/hisilicon/qm.c:2755:9: warning: 'strncpy' specified bound depends on the length of the source argument [-Wstringop-truncation] drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c:2104:33: warning: 'hns3_unic_ethtool_ops' defined but not used [-Wunused-const-variable=] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:113:43: warning: 'hclge_dbg_ssu_reg_0' defined but not used [-Wunused-const-variable=] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:185:43: warning: 'hclge_dbg_ssu_reg_1' defined but not used [-Wunused-const-variable=] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:292:43: warning: 'hclge_dbg_ssu_reg_2' defined but not used [-Wunused-const-variable=] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:301:43: warning: 'hclge_dbg_igu_egu_reg' defined but not used [-Wunused-const-variable=] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:366:43: warning: 'hclge_dbg_rpu_reg_0' defined but not used [-Wunused-const-variable=] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:375:43: warning: 'hclge_dbg_rpu_reg_1' defined but not used [-Wunused-const-variable=] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:391:43: warning: 'hclge_dbg_ncsi_reg' defined but not used [-Wunused-const-variable=] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:463:43: warning: 'hclge_dbg_rtc_reg' defined but not used [-Wunused-const-variable=] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:493:43: warning: 'hclge_dbg_ppp_reg' defined but not used [-Wunused-const-variable=] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:649:43: warning: 'hclge_dbg_rcb_reg' defined but not used [-Wunused-const-variable=] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:721:43: warning: 'hclge_dbg_tqp_reg' defined but not used [-Wunused-const-variable=] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h:97:43: warning: 'hclge_dbg_bios_common_reg' defined but not used [-Wunused-const-variable=] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c:11043:30: warning: unused variable 'ae_dev' [-Wunused-variable] drivers/vfio/pci/vfio_pci.c:123:5: warning: no previous prototype for function 'vfio_pci_set_vendor_irqs' [-Wmissing-prototypes] drivers/vfio/pci/vfio_pci.c:2317:5: warning: no previous prototype for function 'vfio_pci_match' [-Wmissing-prototypes] drivers/vfio/pci/vfio_pci.c:98:5: warning: no previous prototype for function 'vfio_pci_irq_type' [-Wmissing-prototypes] drivers/vfio/pci/vfio_pci_rdwr.c:227:15: warning: no previous prototype for function 'vfio_pci_get_barmap' [-Wmissing-prototypes] Unverified Error/Warning (likely false positive, please contact us if interested): arch/x86/events/zhaoxin/uncore.c:1608 uncore_pci_probe() warn: possible memory leak of 'boxes' drivers/rtc/rtc-mc146818-lib.c:213 mc146818_set_time() error: uninitialized symbol 'save_freq_select'. Error/Warning ids grouped by kconfigs: gcc_recent_errors |-- arm64-allnoconfig | |-- arch-arm64-kernel-fpsimd.c:warning:get_sve_default_vl-defined-but-not-used | |-- arch-arm64-kernel-ipi_nmi.c:error:implicit-declaration-of-function-printk_safe_enter | |-- arch-arm64-kernel-ipi_nmi.c:error:implicit-declaration-of-function-printk_safe_exit | |-- arch-arm64-mm-init.c:warning:no-previous-prototype-for-ascend_enable_all_features | |-- drivers-irqchip-irq-gic-v3-its-platform-msi.c:warning:no-previous-prototype-for-vp_get_irq_domain | |-- kernel-workqueue.c:error:implicit-declaration-of-function-printk_safe_enter | |-- kernel-workqueue.c:error:implicit-declaration-of-function-printk_safe_exit | |-- mm-page_alloc.c:warning:no-previous-prototype-for-__drain_all_pages | `-- mm-page_alloc.c:warning:no-previous-prototype-for-__zone_set_pageset_high_and_batch `-- arm64-defconfig |-- drivers-crypto-hisilicon-qm.c:warning:strncpy-specified-bound-depends-on-the-length-of-the-source-argument |-- drivers-net-ethernet-hisilicon-hns3-hns3_ethtool.c:warning:hns3_unic_ethtool_ops-defined-but-not-used |-- drivers-net-ethernet-hisilicon-hns3-hns3pf-hclge_debugfs.h:warning:hclge_dbg_bios_common_reg-defined-but-not-used |-- drivers-net-ethernet-hisilicon-hns3-hns3pf-hclge_debugfs.h:warning:hclge_dbg_igu_egu_reg-defined-but-not-used |-- drivers-net-ethernet-hisilicon-hns3-hns3pf-hclge_debugfs.h:warning:hclge_dbg_ncsi_reg-defined-but-not-used |-- drivers-net-ethernet-hisilicon-hns3-hns3pf-hclge_debugfs.h:warning:hclge_dbg_ppp_reg-defined-but-not-used |-- drivers-net-ethernet-hisilicon-hns3-hns3pf-hclge_debugfs.h:warning:hclge_dbg_rcb_reg-defined-but-not-used |-- drivers-net-ethernet-hisilicon-hns3-hns3pf-hclge_debugfs.h:warning:hclge_dbg_rpu_reg_0-defined-but-not-used |-- drivers-net-ethernet-hisilicon-hns3-hns3pf-hclge_debugfs.h:warning:hclge_dbg_rpu_reg_1-defined-but-not-used |-- drivers-net-ethernet-hisilicon-hns3-hns3pf-hclge_debugfs.h:warning:hclge_dbg_rtc_reg-defined-but-not-used |-- drivers-net-ethernet-hisilicon-hns3-hns3pf-hclge_debugfs.h:warning:hclge_dbg_ssu_reg_0-defined-but-not-used |-- drivers-net-ethernet-hisilicon-hns3-hns3pf-hclge_debugfs.h:warning:hclge_dbg_ssu_reg_1-defined-but-not-used |-- drivers-net-ethernet-hisilicon-hns3-hns3pf-hclge_debugfs.h:warning:hclge_dbg_ssu_reg_2-defined-but-not-used |-- drivers-net-ethernet-hisilicon-hns3-hns3pf-hclge_debugfs.h:warning:hclge_dbg_tqp_reg-defined-but-not-used `-- drivers-net-ethernet-hisilicon-hns3-hns3pf-hclge_main.c:warning:unused-variable-ae_dev clang_recent_errors |-- x86_64-allyesconfig | |-- drivers-vfio-pci-vfio_pci.c:warning:no-previous-prototype-for-function-vfio_pci_irq_type | |-- drivers-vfio-pci-vfio_pci.c:warning:no-previous-prototype-for-function-vfio_pci_match | |-- drivers-vfio-pci-vfio_pci.c:warning:no-previous-prototype-for-function-vfio_pci_set_vendor_irqs | `-- drivers-vfio-pci-vfio_pci_rdwr.c:warning:no-previous-prototype-for-function-vfio_pci_get_barmap `-- x86_64-randconfig-161-20240124 |-- arch-x86-events-zhaoxin-uncore.c-uncore_pci_probe()-warn:possible-memory-leak-of-boxes `-- drivers-rtc-rtc-mc146818-lib.c-mc146818_set_time()-error:uninitialized-symbol-save_freq_select-. elapsed time: 2803m configs tested: 33 configs skipped: 121 tested configs: alpha allyesconfig gcc arm64 allnoconfig gcc arm64 randconfig-001-20240128 clang arm64 randconfig-002-20240128 clang arm64 randconfig-003-20240128 clang arm64 randconfig-004-20240128 clang hexagon allmodconfig clang hexagon allyesconfig clang loongarch allmodconfig gcc m68k allmodconfig gcc m68k allyesconfig gcc microblaze allmodconfig gcc microblaze allyesconfig gcc mips allyesconfig gcc nios2 allmodconfig gcc nios2 allyesconfig gcc openrisc allyesconfig gcc parisc allmodconfig gcc parisc allyesconfig gcc powerpc allmodconfig clang powerpc allyesconfig clang riscv allmodconfig gcc riscv allyesconfig gcc riscv rv32_defconfig clang s390 allmodconfig gcc s390 allyesconfig gcc sh allmodconfig gcc sh allyesconfig gcc sparc allmodconfig gcc sparc64 allmodconfig gcc sparc64 allyesconfig gcc um allmodconfig gcc um allyesconfig gcc -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:openEuler-1.0-LTS 21291/21579] drivers/spi/spi-phytium-plat.c:192:36: warning: 'phytium_spi_acpi_match' defined but not used
by kernel test robot 27 Jan '24

27 Jan '24

tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: acf72db532a7791fde53af3dc7b4d0a6adcf6eff commit: e8483fcd43fc1dbb8d21bb7eacce804cbab6a7c6 [21291/21579] spi: add phytium spi support config: arm64-randconfig-002-20240125 (https://download.01.org/0day-ci/archive/20240127/202401272041.NCqS8joD-lkp@…) compiler: aarch64-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240127/202401272041.NCqS8joD-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202401272041.NCqS8joD-lkp@intel.com/ All warnings (new ones prefixed by >>): >> drivers/spi/spi-phytium-plat.c:192:36: warning: 'phytium_spi_acpi_match' defined but not used [-Wunused-const-variable=] 192 | static const struct acpi_device_id phytium_spi_acpi_match[] = { | ^~~~~~~~~~~~~~~~~~~~~~ vim +/phytium_spi_acpi_match +192 drivers/spi/spi-phytium-plat.c 191 > 192 static const struct acpi_device_id phytium_spi_acpi_match[] = { 193 {"PHYT000E", 0}, 194 {} 195 }; 196 MODULE_DEVICE_TABLE(acpi, phytium_spi_acpi_match); 197 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-6.6 0/4] misc for fd
by Chen Ridong 27 Jan '24

27 Jan '24

Chen Ridong (4): filescgroup: remove files of dfl_cftypes. filecgroup: move code of filescontrol.c to files-cgroup.c misc: add MISC_CG_RES_FD resource to control fd. Documentation: add misc resource statement. Documentation/admin-guide/cgroup-v2.rst | 7 + fs/Makefile | 2 + fs/file.c | 16 +- fs/files-cgroup.c | 335 +++++++++++++++++++++++ fs/filescontrol.c | 339 +++--------------------- fs/misc-fd.c | 92 +++++++ include/linux/fdtable.h | 1 + include/linux/files-cgroup.h | 33 +++ include/linux/filescontrol.h | 45 ++-- include/linux/misc-fd.h | 23 ++ include/linux/misc_cgroup.h | 2 + kernel/cgroup/misc.c | 2 + 12 files changed, 563 insertions(+), 334 deletions(-) create mode 100644 fs/files-cgroup.c create mode 100644 fs/misc-fd.c create mode 100644 include/linux/files-cgroup.h create mode 100644 include/linux/misc-fd.h -- 2.34.1

1 4

[PATCH OLK-6.6 0/4] misc for df
by Chen Ridong 27 Jan '24

27 Jan '24

Add a new misc resource for controlling fd. Chen Ridong (4): filescgroup: remove files of dfl_cftypes. filecgroup: move code of filescontrol.c to files-cgroup.c misc: add MISC_CG_RES_FD resource to control fd. Documentation: add misc resource statement. Documentation/admin-guide/cgroup-v2.rst | 7 + fs/Makefile | 2 + fs/file.c | 16 +- fs/files-cgroup.c | 335 +++++++++++++++++++++++ fs/filescontrol.c | 339 +++--------------------- fs/misc-fd.c | 92 +++++++ include/linux/fdtable.h | 1 + include/linux/files-cgroup.h | 33 +++ include/linux/filescontrol.h | 45 ++-- include/linux/misc-fd.h | 23 ++ include/linux/misc_cgroup.h | 2 + kernel/cgroup/misc.c | 2 + 12 files changed, 563 insertions(+), 334 deletions(-) create mode 100644 fs/files-cgroup.c create mode 100644 fs/misc-fd.c create mode 100644 include/linux/files-cgroup.h create mode 100644 include/linux/misc-fd.h -- 2.34.1

2 5

[PATCH OLK-6.6 0/4] misc for fd
by Chen Ridong 27 Jan '24

27 Jan '24

V2: Add a new misc resource for controlling fd. Chen Ridong (4): filescgroup: remove files of dfl_cftypes. filecgroup: move code of filescontrol.c to files-cgroup.c misc: add MISC_CG_RES_FD resource to control fd. Documentation: add misc resource statement. Documentation/admin-guide/cgroup-v2.rst | 7 + fs/Makefile | 2 + fs/file.c | 16 +- fs/files-cgroup.c | 335 +++++++++++++++++++++++ fs/filescontrol.c | 339 +++--------------------- fs/misc-fd.c | 92 +++++++ include/linux/fdtable.h | 1 + include/linux/files-cgroup.h | 33 +++ include/linux/filescontrol.h | 45 ++-- include/linux/misc-fd.h | 23 ++ include/linux/misc_cgroup.h | 2 + kernel/cgroup/misc.c | 2 + 12 files changed, 563 insertions(+), 334 deletions(-) create mode 100644 fs/files-cgroup.c create mode 100644 fs/misc-fd.c create mode 100644 include/linux/files-cgroup.h create mode 100644 include/linux/misc-fd.h -- 2.34.1

1 4

[openeuler:openEuler-1.0-LTS 20703/21579] kernel/sched/core.c:5845:2: error: implicit declaration of function 'tg_update_affinity_domains'
by kernel test robot 27 Jan '24

27 Jan '24

tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: acf72db532a7791fde53af3dc7b4d0a6adcf6eff commit: 713cfd2684fa5ea08b144d92b9858b932c0f1705 [20703/21579] sched: Introduce smart grid scheduling strategy for cfs config: x86_64-randconfig-001-20240125 (https://download.01.org/0day-ci/archive/20240127/202401271837.ND9zSaBY-lkp@…) compiler: clang version 17.0.6 (https://github.com/llvm/llvm-project 6009708b4367171ccdbf4b5905cb6a803753fe18) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240127/202401271837.ND9zSaBY-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202401271837.ND9zSaBY-lkp@intel.com/ All errors (new ones prefixed by >>): In file included from kernel/sched/core.c:8: In file included from kernel/sched/sched.h:39: In file included from include/linux/blkdev.h:16: include/linux/pagemap.h:425:21: warning: cast from 'int (*)(struct file *, struct page *)' to 'filler_t *' (aka 'int (*)(void *, struct page *)') converts to incompatible function type [-Wcast-function-type-strict] 425 | filler_t *filler = (filler_t *)mapping->a_ops->readpage; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from kernel/sched/core.c:8: kernel/sched/sched.h:1249:15: warning: cast from 'void (*)(struct rq *)' to 'void (*)(struct callback_head *)' converts to incompatible function type [-Wcast-function-type-strict] 1249 | head->func = (void (*)(struct callback_head *))func; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ kernel/sched/core.c:1587:6: warning: no previous prototype for function 'sched_set_stop_task' [-Wmissing-prototypes] 1587 | void sched_set_stop_task(int cpu, struct task_struct *stop) | ^ kernel/sched/core.c:1587:1: note: declare 'static' if the function is not intended to be used outside of this translation unit 1587 | void sched_set_stop_task(int cpu, struct task_struct *stop) | ^ | static kernel/sched/core.c:2741:10: warning: cast from 'void (*)(struct callback_head *)' to 'void (*)(struct rq *)' converts to incompatible function type [-Wcast-function-type-strict] 2741 | func = (void (*)(struct rq *))head->func; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ kernel/sched/core.c:3771:35: warning: no previous prototype for function 'preempt_schedule_irq' [-Wmissing-prototypes] 3771 | asmlinkage __visible void __sched preempt_schedule_irq(void) | ^ kernel/sched/core.c:3771:22: note: declare 'static' if the function is not intended to be used outside of this translation unit 3771 | asmlinkage __visible void __sched preempt_schedule_irq(void) | ^ | static >> kernel/sched/core.c:5845:2: error: implicit declaration of function 'tg_update_affinity_domains' [-Werror,-Wimplicit-function-declaration] 5845 | tg_update_affinity_domains(cpu, 1); | ^ kernel/sched/core.c:5904:2: error: implicit declaration of function 'tg_update_affinity_domains' [-Werror,-Wimplicit-function-declaration] 5904 | tg_update_affinity_domains(cpu, 0); | ^ >> kernel/sched/core.c:5976:2: error: implicit declaration of function 'init_auto_affinity' [-Werror,-Wimplicit-function-declaration] 5976 | init_auto_affinity(&root_task_group); | ^ kernel/sched/core.c:5976:2: note: did you mean 'irq_set_affinity'? include/linux/interrupt.h:292:1: note: 'irq_set_affinity' declared here 292 | irq_set_affinity(unsigned int irq, const struct cpumask *cpumask) | ^ >> kernel/sched/core.c:5976:22: error: use of undeclared identifier 'root_task_group'; did you mean 'task_group'? 5976 | init_auto_affinity(&root_task_group); | ^~~~~~~~~~~~~~~ | task_group kernel/sched/sched.h:1444:34: note: 'task_group' declared here 1444 | static inline struct task_group *task_group(struct task_struct *p) | ^ kernel/sched/core.c:6029:32: warning: variable 'ptr' set but not used [-Wunused-but-set-variable] 6029 | unsigned long alloc_size = 0, ptr; | ^ 6 warnings and 4 errors generated. vim +/tg_update_affinity_domains +5845 kernel/sched/core.c 5831 5832 int sched_cpu_activate(unsigned int cpu) 5833 { 5834 struct rq *rq = cpu_rq(cpu); 5835 struct rq_flags rf; 5836 5837 #ifdef CONFIG_SCHED_SMT 5838 /* 5839 * When going up, increment the number of cores with SMT present. 5840 */ 5841 if (cpumask_weight(cpu_smt_mask(cpu)) == 2) 5842 static_branch_inc_cpuslocked(&sched_smt_present); 5843 #endif 5844 set_cpu_active(cpu, true); > 5845 tg_update_affinity_domains(cpu, 1); 5846 5847 if (sched_smp_initialized) { 5848 sched_domains_numa_masks_set(cpu); 5849 cpuset_cpu_active(); 5850 } 5851 5852 /* 5853 * Put the rq online, if not already. This happens: 5854 * 5855 * 1) In the early boot process, because we build the real domains 5856 * after all CPUs have been brought up. 5857 * 5858 * 2) At runtime, if cpuset_cpu_active() fails to rebuild the 5859 * domains. 5860 */ 5861 rq_lock_irqsave(rq, &rf); 5862 if (rq->rd) { 5863 BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span)); 5864 set_rq_online(rq); 5865 } 5866 rq_unlock_irqrestore(rq, &rf); 5867 5868 update_max_interval(); 5869 5870 return 0; 5871 } 5872 5873 int sched_cpu_deactivate(unsigned int cpu) 5874 { 5875 int ret; 5876 5877 set_cpu_active(cpu, false); 5878 /* 5879 * We've cleared cpu_active_mask, wait for all preempt-disabled and RCU 5880 * users of this state to go away such that all new such users will 5881 * observe it. 5882 * 5883 * Do sync before park smpboot threads to take care the rcu boost case. 5884 */ 5885 synchronize_rcu_mult(call_rcu, call_rcu_sched); 5886 5887 #ifdef CONFIG_SCHED_SMT 5888 /* 5889 * When going down, decrement the number of cores with SMT present. 5890 */ 5891 if (cpumask_weight(cpu_smt_mask(cpu)) == 2) 5892 static_branch_dec_cpuslocked(&sched_smt_present); 5893 #endif 5894 5895 if (!sched_smp_initialized) 5896 return 0; 5897 5898 ret = cpuset_cpu_inactive(cpu); 5899 if (ret) { 5900 set_cpu_active(cpu, true); 5901 return ret; 5902 } 5903 sched_domains_numa_masks_clear(cpu); 5904 tg_update_affinity_domains(cpu, 0); 5905 return 0; 5906 } 5907 5908 static void sched_rq_cpu_starting(unsigned int cpu) 5909 { 5910 struct rq *rq = cpu_rq(cpu); 5911 5912 rq->calc_load_update = calc_load_update; 5913 update_max_interval(); 5914 } 5915 5916 int sched_cpu_starting(unsigned int cpu) 5917 { 5918 sched_rq_cpu_starting(cpu); 5919 sched_tick_start(cpu); 5920 return 0; 5921 } 5922 5923 #ifdef CONFIG_HOTPLUG_CPU 5924 int sched_cpu_dying(unsigned int cpu) 5925 { 5926 struct rq *rq = cpu_rq(cpu); 5927 struct rq_flags rf; 5928 5929 /* Handle pending wakeups and then migrate everything off */ 5930 sched_ttwu_pending(); 5931 sched_tick_stop(cpu); 5932 5933 rq_lock_irqsave(rq, &rf); 5934 if (rq->rd) { 5935 BUG_ON(!cpumask_test_cpu(cpu, rq->rd->span)); 5936 set_rq_offline(rq); 5937 } 5938 migrate_tasks(rq, &rf); 5939 BUG_ON(rq->nr_running != 1); 5940 rq_unlock_irqrestore(rq, &rf); 5941 5942 calc_load_migrate(rq); 5943 update_max_interval(); 5944 nohz_balance_exit_idle(rq); 5945 hrtick_clear(rq); 5946 return 0; 5947 } 5948 #endif 5949 5950 void __init sched_init_smp(void) 5951 { 5952 sched_init_numa(); 5953 5954 /* 5955 * There's no userspace yet to cause hotplug operations; hence all the 5956 * CPU masks are stable and all blatant races in the below code cannot 5957 * happen. The hotplug lock is nevertheless taken to satisfy lockdep, 5958 * but there won't be any contention on it. 5959 */ 5960 cpus_read_lock(); 5961 mutex_lock(&sched_domains_mutex); 5962 sched_init_domains(cpu_active_mask); 5963 mutex_unlock(&sched_domains_mutex); 5964 cpus_read_unlock(); 5965 5966 /* Move init over to a non-isolated CPU */ 5967 if (set_cpus_allowed_ptr(current, housekeeping_cpumask(HK_FLAG_DOMAIN)) < 0) 5968 BUG(); 5969 sched_init_granularity(); 5970 5971 init_sched_rt_class(); 5972 init_sched_dl_class(); 5973 5974 sched_smp_initialized = true; 5975 > 5976 init_auto_affinity(&root_task_group); 5977 } 5978 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-5.10] nfc: nci: fix possible NULL pointer dereference in send_acknowledge()
by Ziyang Xuan 27 Jan '24

27 Jan '24

From: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> stable inclusion from stable-v5.10.199 commit c95fa5b20fe03609e0894656fa43c18045b5097e category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8YCSH CVE: CVE-2023-46343 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 7937609cd387246aed994e81aa4fa951358fba41 upstream. Handle memory allocation failure from nci_skb_alloc() (calling alloc_skb()) to avoid possible NULL pointer dereference. Reported-by: 黄思聪 <huangsicong(a)iie.ac.cn> Fixes: 391d8a2da787 ("NFC: Add NCI over SPI receive") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Reviewed-by: Simon Horman <horms(a)kernel.org> Link: https://lore.kernel.org/r/20231013184129.18738-1-krzysztof.kozlowski@linaro… Signed-off-by: Jakub Kicinski <kuba(a)kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Signed-off-by: Ziyang Xuan <william.xuanziyang(a)huawei.com> --- net/nfc/nci/spi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/nfc/nci/spi.c b/net/nfc/nci/spi.c index 7d8e10e27c20..0651640d6868 100644 --- a/net/nfc/nci/spi.c +++ b/net/nfc/nci/spi.c @@ -151,6 +151,8 @@ static int send_acknowledge(struct nci_spi *nspi, u8 acknowledge) int ret; skb = nci_skb_alloc(nspi->ndev, 0, GFP_KERNEL); + if (!skb) + return -ENOMEM; /* add the NCI SPI header to the start of the buffer */ hdr = skb_push(skb, NCI_SPI_HDR_LEN); -- 2.25.1

1 0