- Kernel - mailweb.openeuler.org

[PATCH OLK-5.10] perf: Add PMCG platform information for HiSilicon HIP09A
by Yushan Wang 28 Nov '24

28 Nov '24

From: Qinxin Xia <xiaqinxin(a)huawei.com> driver inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/IB7PW0 CVE: NA ---------------------------------------------------------------------- Description: HiSilicon HIP09A platforms using the same SMMU PMCG with HIP09 and thus suffers the same erratum. List them in the PMCG platform information list without introducing a new SMMU PMCG Model. Signed-off-by: Qinxin Xia <xiaqinxin(a)huawei.com> Signed-off-by: zhangqz <14294317+zhangqizhi3(a)user.noreply.gitee.com> --- Documentation/arm64/silicon-errata.rst | 5 +++-- drivers/acpi/arm64/iort.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/arm64/silicon-errata.rst b/Documentation/arm64/silicon-errata.rst index 77ba5531e0ee..29287a91bbb7 100644 --- a/Documentation/arm64/silicon-errata.rst +++ b/Documentation/arm64/silicon-errata.rst @@ -147,8 +147,9 @@ stable kernels. +----------------+-----------------+-----------------+-----------------------------+ | Hisilicon | Hip08 SMMU PMCG | #162001800 | N/A | +----------------+-----------------+-----------------+-----------------------------+ -| Hisilicon | Hip{08,09,10,10C| #162001900 | N/A | -| | ,11} SMMU PMCG | | | +| Hisilicon | Hip{08,09,09A, | #162001900 | N/A | +| | 10,10C,11} | | | +| | SMMU PMCG | | | +----------------+-----------------+-----------------+-----------------------------+ | Hisilicon | TSV{110,200} | #1980005 | HISILICON_ERRATUM_1980005 | +----------------+-----------------+-----------------+-----------------------------+ diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index a0786cd8ca83..a86f65e47d17 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -1481,6 +1481,8 @@ static struct acpi_platform_list pmcg_plat_info[] __initdata = { /* HiSilicon Hip09 Platform */ {"HISI ", "HIP09 ", 0, ACPI_SIG_IORT, greater_than_or_equal, "Erratum #162001900", IORT_SMMU_V3_PMCG_HISI_HIP09}, + {"HISI ", "HIP09A ", 0, ACPI_SIG_IORT, greater_than_or_equal, + "Erratum #162001900", IORT_SMMU_V3_PMCG_HISI_HIP09}, /* HiSilicon Hip10/11 Platform uses the same SMMU IP with Hip09 */ {"HISI ", "HIP10 ", 0, ACPI_SIG_IORT, greater_than_or_equal, "Erratum #162001900", IORT_SMMU_V3_PMCG_HISI_HIP09}, -- 2.33.0

2 1

[openeuler:OLK-5.10 2499/2499] include/linux/string.h:290:33: warning: '__builtin_strncpy' specified bound depends on the length of the source argument
by kernel test robot 28 Nov '24

28 Nov '24

tree: https://gitee.com/openeuler/kernel.git OLK-5.10 head: 48ec47c01c3800fd4419afd91af83e95ba9584d5 commit: a1666f44c2250f7413e73e2f4c02cb2c01f9e3b0 [2499/2499] crypto: hisilicon/qm - support no-sva feature config: arm64-randconfig-002-20241128 (https://download.01.org/0day-ci/archive/20241128/202411281656.uJnZiWID-lkp@…) compiler: aarch64-linux-gcc (GCC) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241128/202411281656.uJnZiWID-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/202411281656.uJnZiWID-lkp@intel.com/ All warnings (new ones prefixed by >>): In file included from include/linux/bitmap.h:9, from include/linux/cpumask.h:12, from include/linux/smp.h:13, from include/linux/lockdep.h:14, from include/linux/mutex.h:17, from include/linux/kernfs.h:13, from include/linux/sysfs.h:17, from include/linux/kobject.h:21, from include/linux/of.h:17, from include/linux/irqdomain.h:35, from include/linux/acpi.h:13, from drivers/crypto/hisilicon/qm.c:4: In function 'strncpy', inlined from 'qm_alloc_uacce' at drivers/crypto/hisilicon/qm.c:2755:2, inlined from 'hisi_qm_init' at drivers/crypto/hisilicon/qm.c:5542:8: >> include/linux/string.h:290:33: warning: '__builtin_strncpy' specified bound depends on the length of the source argument [-Wstringop-truncation] 290 | #define __underlying_strncpy __builtin_strncpy | ^ include/linux/string.h:300:16: note: in expansion of macro '__underlying_strncpy' 300 | return __underlying_strncpy(p, q, size); | ^~~~~~~~~~~~~~~~~~~~ In function 'strlen', inlined from 'qm_alloc_uacce' at drivers/crypto/hisilicon/qm.c:2748:13, inlined from 'hisi_qm_init' at drivers/crypto/hisilicon/qm.c:5542:8: include/linux/string.h:288:33: note: length computed here 288 | #define __underlying_strlen __builtin_strlen | ^ include/linux/string.h:321:24: note: in expansion of macro '__underlying_strlen' 321 | return __underlying_strlen(p); | ^~~~~~~~~~~~~~~~~~~ vim +/__builtin_strncpy +290 include/linux/string.h 47227d27e2fcb0 Daniel Axtens 2020-06-03 268 47227d27e2fcb0 Daniel Axtens 2020-06-03 269 #ifdef CONFIG_KASAN 47227d27e2fcb0 Daniel Axtens 2020-06-03 270 extern void *__underlying_memchr(const void *p, int c, __kernel_size_t size) __RENAME(memchr); 47227d27e2fcb0 Daniel Axtens 2020-06-03 271 extern int __underlying_memcmp(const void *p, const void *q, __kernel_size_t size) __RENAME(memcmp); 47227d27e2fcb0 Daniel Axtens 2020-06-03 272 extern void *__underlying_memcpy(void *p, const void *q, __kernel_size_t size) __RENAME(memcpy); 47227d27e2fcb0 Daniel Axtens 2020-06-03 273 extern void *__underlying_memmove(void *p, const void *q, __kernel_size_t size) __RENAME(memmove); 47227d27e2fcb0 Daniel Axtens 2020-06-03 274 extern void *__underlying_memset(void *p, int c, __kernel_size_t size) __RENAME(memset); 47227d27e2fcb0 Daniel Axtens 2020-06-03 275 extern char *__underlying_strcat(char *p, const char *q) __RENAME(strcat); 47227d27e2fcb0 Daniel Axtens 2020-06-03 276 extern char *__underlying_strcpy(char *p, const char *q) __RENAME(strcpy); 47227d27e2fcb0 Daniel Axtens 2020-06-03 277 extern __kernel_size_t __underlying_strlen(const char *p) __RENAME(strlen); 47227d27e2fcb0 Daniel Axtens 2020-06-03 278 extern char *__underlying_strncat(char *p, const char *q, __kernel_size_t count) __RENAME(strncat); 47227d27e2fcb0 Daniel Axtens 2020-06-03 279 extern char *__underlying_strncpy(char *p, const char *q, __kernel_size_t size) __RENAME(strncpy); 47227d27e2fcb0 Daniel Axtens 2020-06-03 280 #else 47227d27e2fcb0 Daniel Axtens 2020-06-03 281 #define __underlying_memchr __builtin_memchr 47227d27e2fcb0 Daniel Axtens 2020-06-03 282 #define __underlying_memcmp __builtin_memcmp 47227d27e2fcb0 Daniel Axtens 2020-06-03 283 #define __underlying_memcpy __builtin_memcpy 47227d27e2fcb0 Daniel Axtens 2020-06-03 284 #define __underlying_memmove __builtin_memmove 47227d27e2fcb0 Daniel Axtens 2020-06-03 285 #define __underlying_memset __builtin_memset 47227d27e2fcb0 Daniel Axtens 2020-06-03 286 #define __underlying_strcat __builtin_strcat 47227d27e2fcb0 Daniel Axtens 2020-06-03 287 #define __underlying_strcpy __builtin_strcpy 47227d27e2fcb0 Daniel Axtens 2020-06-03 288 #define __underlying_strlen __builtin_strlen 47227d27e2fcb0 Daniel Axtens 2020-06-03 289 #define __underlying_strncat __builtin_strncat 47227d27e2fcb0 Daniel Axtens 2020-06-03 @290 #define __underlying_strncpy __builtin_strncpy 47227d27e2fcb0 Daniel Axtens 2020-06-03 291 #endif 47227d27e2fcb0 Daniel Axtens 2020-06-03 292 :::::: The code at line 290 was first introduced by commit :::::: 47227d27e2fcb01a9e8f5958d8997cf47a820afc string.h: fix incompatibility between FORTIFY_SOURCE and KASAN :::::: TO: Daniel Axtens <dja(a)axtens.net> :::::: CC: Linus Torvalds <torvalds(a)linux-foundation.org> -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:OLK-6.6 1546/1546] kernel/irq/proc.c:334:13: warning: no previous prototype for 'register_irqchip_proc'
by kernel test robot 28 Nov '24

28 Nov '24

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: 7f63ebb23914c3b2e597112d96eba6edb440e907 commit: 3053668e6b211924bb67c19d791a5a532eca2ad8 [1546/1546] arm64: Introduce Xint software solution config: x86_64-rhel-9.4 (https://download.01.org/0day-ci/archive/20241128/202411281636.uf1FPOs2-lkp@…) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241128/202411281636.uf1FPOs2-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/202411281636.uf1FPOs2-lkp@intel.com/ All warnings (new ones prefixed by >>): >> kernel/irq/proc.c:334:13: warning: no previous prototype for 'register_irqchip_proc' [-Wmissing-prototypes] 334 | void __weak register_irqchip_proc(struct irq_desc *desc, void *irqp) { } | ^~~~~~~~~~~~~~~~~~~~~ >> kernel/irq/proc.c:335:13: warning: no previous prototype for 'unregister_irqchip_proc' [-Wmissing-prototypes] 335 | void __weak unregister_irqchip_proc(struct irq_desc *desc) { } | ^~~~~~~~~~~~~~~~~~~~~~~ vim +/register_irqchip_proc +334 kernel/irq/proc.c 333 > 334 void __weak register_irqchip_proc(struct irq_desc *desc, void *irqp) { } > 335 void __weak unregister_irqchip_proc(struct irq_desc *desc) { } 336 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:OLK-6.6 1546/1546] kernel/irq/proc.c:334:13: warning: no previous prototype for function 'register_irqchip_proc'
by kernel test robot 28 Nov '24

28 Nov '24

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: 5d0b95afdce7e316c8df2aac1a9d83f257e09297 commit: 3053668e6b211924bb67c19d791a5a532eca2ad8 [1546/1546] arm64: Introduce Xint software solution config: x86_64-kexec (https://download.01.org/0day-ci/archive/20241128/202411281629.stNRSuEn-lkp@…) compiler: clang version 19.1.3 (https://github.com/llvm/llvm-project ab51eccf88f5321e7c60591c5546b254b6afab99) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241128/202411281629.stNRSuEn-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/202411281629.stNRSuEn-lkp@intel.com/ All warnings (new ones prefixed by >>): >> kernel/irq/proc.c:334:13: warning: no previous prototype for function 'register_irqchip_proc' [-Wmissing-prototypes] 334 | void __weak register_irqchip_proc(struct irq_desc *desc, void *irqp) { } | ^ kernel/irq/proc.c:334:1: note: declare 'static' if the function is not intended to be used outside of this translation unit 334 | void __weak register_irqchip_proc(struct irq_desc *desc, void *irqp) { } | ^ | static >> kernel/irq/proc.c:335:13: warning: no previous prototype for function 'unregister_irqchip_proc' [-Wmissing-prototypes] 335 | void __weak unregister_irqchip_proc(struct irq_desc *desc) { } | ^ kernel/irq/proc.c:335:1: note: declare 'static' if the function is not intended to be used outside of this translation unit 335 | void __weak unregister_irqchip_proc(struct irq_desc *desc) { } | ^ | static 2 warnings generated. vim +/register_irqchip_proc +334 kernel/irq/proc.c 333 > 334 void __weak register_irqchip_proc(struct irq_desc *desc, void *irqp) { } > 335 void __weak unregister_irqchip_proc(struct irq_desc *desc) { } 336 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:OLK-6.6 1540/1540] drivers/iommu/arm/arm-smmu-v3/arm-s-smmu-v3.c:527:13: warning: no previous prototype for 'virtcca_smmu_gerror_handler'
by kernel test robot 28 Nov '24

28 Nov '24

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: 7f63ebb23914c3b2e597112d96eba6edb440e907 commit: ed007ade0cef81fb47328683b8a7eec5edfa8494 [1540/1540] virtcca feature: secure smmu init config: arm64-randconfig-002-20241128 (https://download.01.org/0day-ci/archive/20241128/202411281610.h9QxfChh-lkp@…) compiler: aarch64-linux-gcc (GCC) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241128/202411281610.h9QxfChh-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/202411281610.h9QxfChh-lkp@intel.com/ All warnings (new ones prefixed by >>): drivers/iommu/arm/arm-smmu-v3/arm-s-smmu-v3.c:509:13: warning: no previous prototype for 'virtcca_smmu_evtq_thread' [-Wmissing-prototypes] 509 | irqreturn_t virtcca_smmu_evtq_thread(int irq, void *dev) | ^~~~~~~~~~~~~~~~~~~~~~~~ >> drivers/iommu/arm/arm-smmu-v3/arm-s-smmu-v3.c:527:13: warning: no previous prototype for 'virtcca_smmu_gerror_handler' [-Wmissing-prototypes] 527 | irqreturn_t virtcca_smmu_gerror_handler(int irq, void *dev) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ vim +/virtcca_smmu_gerror_handler +527 drivers/iommu/arm/arm-smmu-v3/arm-s-smmu-v3.c 518 519 /** 520 * The secure gerror handler 521 * @irq: Irq index 522 * @dev: Smmu device 523 * 524 * Returns: 525 * %IRQ_NONE no errors pending 526 */ > 527 irqreturn_t virtcca_smmu_gerror_handler(int irq, void *dev) 528 { 529 u64 gerror, gerrorn, active; 530 u64 ret; 531 struct arm_smmu_device *smmu = dev; 532 533 ret = tmi_smmu_read(smmu->ioaddr, ARM_SMMU_S_GERROR, ARM_S_SMMU_REG_32_BIT); 534 if (ret >> ARM_S_SMMU_REG_32_BIT) { 535 dev_err(smmu->dev, "S_SMMU: get arm_smmu_s_gerror register failed\n"); 536 return IRQ_NONE; 537 } 538 gerror = ret & ARM_S_SMMU_MASK_UPPER_32_BIT; 539 540 ret = tmi_smmu_read(smmu->ioaddr, ARM_SMMU_S_GERRORN, ARM_S_SMMU_REG_32_BIT); 541 if (ret >> ARM_S_SMMU_REG_32_BIT) { 542 dev_err(smmu->dev, "S_SMMU: get arm_smmu_s_gerror register failed\n"); 543 return IRQ_NONE; 544 } 545 gerrorn = ret & ARM_S_SMMU_MASK_UPPER_32_BIT; 546 547 active = gerror ^ gerrorn; 548 if (!(active & GERROR_ERR_MASK)) 549 return IRQ_NONE; /* No errors pending */ 550 551 dev_warn(smmu->dev, 552 "S_SMMU: unexpected secure global error reported, this could be serious, active %llx\n", 553 active); 554 555 if (active & GERROR_SFM_ERR) { 556 dev_err(smmu->dev, "S_SMMU: device has entered service failure mode!\n"); 557 virtcca_smmu_device_disable(smmu); 558 } 559 560 if (active & GERROR_MSI_GERROR_ABT_ERR) 561 dev_warn(smmu->dev, "S_SMMU: gerror msi write aborted\n"); 562 563 if (active & GERROR_MSI_PRIQ_ABT_ERR) 564 dev_warn(smmu->dev, "S_SMMU: priq msi write aborted\n"); 565 566 if (active & GERROR_MSI_EVTQ_ABT_ERR) 567 dev_warn(smmu->dev, "S_SMMU: evtq msi write aborted\n"); 568 569 if (active & GERROR_MSI_CMDQ_ABT_ERR) 570 dev_warn(smmu->dev, "S_SMMU: cmdq msi write aborted\n"); 571 572 if (active & GERROR_PRIQ_ABT_ERR) 573 dev_err(smmu->dev, "S_SMMU: priq write aborted -- events may have been lost\n"); 574 575 if (active & GERROR_EVTQ_ABT_ERR) 576 dev_err(smmu->dev, "S_SMMU: evtq write aborted -- events may have been lost\n"); 577 578 if (active & GERROR_CMDQ_ERR) 579 dev_warn(smmu->dev, "S_SMMU: cmdq err\n"); 580 581 if (tmi_smmu_write(smmu->ioaddr, ARM_SMMU_S_GERRORN, gerror, ARM_S_SMMU_REG_32_BIT)) { 582 dev_err(smmu->dev, "S_SMMU: write arm_smmu_s_gerrorn failed\n"); 583 return IRQ_NONE; 584 } 585 586 return IRQ_HANDLED; 587 } 588 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-6.6 0/2] fix CVE-2024-49861
by Xiaomeng Zhang 28 Nov '24

28 Nov '24

*** BLURB HERE *** Daniel Borkmann (1): bpf: Fix helper writes to read-only maps Xiaomeng Zhang (1): bpf: Fix kabi breakage in enum bpf_type_flag and bpf_arg_type include/linux/bpf.h | 11 +++++++++-- kernel/bpf/helpers.c | 6 ++++-- kernel/bpf/syscall.c | 3 ++- kernel/bpf/verifier.c | 41 +++++----------------------------------- kernel/trace/bpf_trace.c | 6 ++++-- net/core/filter.c | 6 ++++-- 6 files changed, 28 insertions(+), 45 deletions(-) -- 2.34.1

2 3

[openeuler:openEuler-1.0-LTS 1315/1315] drivers/nvme/host/core.c:1163:41: error: expected ';' before 'ptrval'
by kernel test robot 28 Nov '24

28 Nov '24

Hi Nick, FYI, the error/warning still remains. tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: 897ce607838618bcd783a6493748dd11891683fd commit: b8ba22a604e4d0a3ad8e23af22f432e12b6f1a65 [1315/1315] nvme: fix compat address handling in several ioctls config: arm64-randconfig-003-20241128 (https://download.01.org/0day-ci/archive/20241128/202411281354.6yDNwxF4-lkp@…) compiler: aarch64-linux-gcc (GCC) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241128/202411281354.6yDNwxF4-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/202411281354.6yDNwxF4-lkp@intel.com/ All errors (new ones prefixed by >>): drivers/nvme/host/core.c: In function 'nvme_to_user_ptr': drivers/nvme/host/core.c:1163:27: error: 'compat_uptr_t' undeclared (first use in this function); did you mean 'compat_time_t'? 1163 | ptrval = (compat_uptr_t)ptrval; | ^~~~~~~~~~~~~ | compat_time_t drivers/nvme/host/core.c:1163:27: note: each undeclared identifier is reported only once for each function it appears in >> drivers/nvme/host/core.c:1163:41: error: expected ';' before 'ptrval' 1163 | ptrval = (compat_uptr_t)ptrval; | ^~~~~~ | ; vim +1163 drivers/nvme/host/core.c 1154 1155 /* 1156 * Convert integer values from ioctl structures to user pointers, silently 1157 * ignoring the upper bits in the compat case to match behaviour of 32-bit 1158 * kernels. 1159 */ 1160 static void __user *nvme_to_user_ptr(uintptr_t ptrval) 1161 { 1162 if (in_compat_syscall()) > 1163 ptrval = (compat_uptr_t)ptrval; 1164 return (void __user *)ptrval; 1165 } 1166 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:OLK-6.6 1540/1540] arch/arm64/kvm/arm.c:1037:16: error: 'struct kvm_pmu' has no member named 'irq_level'
by kernel test robot 28 Nov '24

28 Nov '24

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: 5d0b95afdce7e316c8df2aac1a9d83f257e09297 commit: 1182be89002c268a781bd90b25f18da76cfea732 [1540/1540] pmu: enable pmu phys irq inject for cvm config: arm64-randconfig-002-20241128 (https://download.01.org/0day-ci/archive/20241128/202411281342.FMo3GAwH-lkp@…) compiler: aarch64-linux-gcc (GCC) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241128/202411281342.FMo3GAwH-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/202411281342.FMo3GAwH-lkp@intel.com/ All errors (new ones prefixed by >>): arch/arm64/kvm/arm.c: In function 'update_pmu_phys_irq': >> arch/arm64/kvm/arm.c:1037:16: error: 'struct kvm_pmu' has no member named 'irq_level' 1037 | if (pmu->irq_level) { | ^~ arch/arm64/kvm/arm.c:1039:17: error: implicit declaration of function 'arm_pmu_set_phys_irq' [-Wimplicit-function-declaration] 1039 | arm_pmu_set_phys_irq(false); | ^~~~~~~~~~~~~~~~~~~~ vim +1037 arch/arm64/kvm/arm.c 1031 1032 #ifdef CONFIG_HISI_VIRTCCA_HOST 1033 static inline void update_pmu_phys_irq(struct kvm_vcpu *vcpu, bool *pmu_stopped) 1034 { 1035 struct kvm_pmu *pmu = &vcpu->arch.pmu; 1036 > 1037 if (pmu->irq_level) { 1038 *pmu_stopped = true; 1039 arm_pmu_set_phys_irq(false); 1040 } 1041 } 1042 #endif 1043 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-5.10] NFSD: Never decrement pending_async_copies on error
by Li Lingfeng 28 Nov '24

28 Nov '24

From: Chuck Lever <chuck.lever(a)oracle.com> mainline inclusion from mainline-v6.12-rc6 commit 8286f8b622990194207df9ab852e0f87c60d35e9 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB5KQU CVE: CVE-2024-53073 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… ---------------------------------------------------------------------- The error flow in nfsd4_copy() calls cleanup_async_copy(), which already decrements nn->pending_async_copies. Reported-by: Olga Kornievskaia <okorniev(a)redhat.com> Fixes: aadc3bbea163 ("NFSD: Limit the number of concurrent async COPY operations") Signed-off-by: Chuck Lever <chuck.lever(a)oracle.com> Conflicts: fs/nfsd/nfs4proc.c [Commit 87689df69491("NFSD: Shrink size of struct nfsd4_copy") add the allocation of cp_src.] Signed-off-by: Li Lingfeng <lilingfeng3(a)huawei.com> --- fs/nfsd/nfs4proc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 0c209443f9be..96c4e2616b51 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1532,10 +1532,8 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, refcount_set(&async_copy->refcount, 1); /* Arbitrary cap on number of pending async copy operations */ if (atomic_inc_return(&nn->pending_async_copies) > - (int)rqstp->rq_pool->sp_nrthreads) { - atomic_dec(&nn->pending_async_copies); + (int)rqstp->rq_pool->sp_nrthreads) goto out_err; - } if (!nfs4_init_copy_state(nn, copy)) goto out_err; memcpy(&copy->cp_res.cb_stateid, &copy->cp_stateid.stid, -- 2.31.1

2 1

[PATCH OLK-6.6] NFSD: Never decrement pending_async_copies on error
by Li Lingfeng 28 Nov '24

28 Nov '24

From: Chuck Lever <chuck.lever(a)oracle.com> mainline inclusion from mainline-v6.12-rc6 commit 8286f8b622990194207df9ab852e0f87c60d35e9 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB5KQU CVE: CVE-2024-53073 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… ---------------------------------------------------------------------- The error flow in nfsd4_copy() calls cleanup_async_copy(), which already decrements nn->pending_async_copies. Reported-by: Olga Kornievskaia <okorniev(a)redhat.com> Fixes: aadc3bbea163 ("NFSD: Limit the number of concurrent async COPY operations") Signed-off-by: Chuck Lever <chuck.lever(a)oracle.com> Conflicts: fs/nfsd/nfs4proc.c [Commit 8adb368675cf("[Backport] NFSD: Limit the number of concurrent async COPY operations") miss partial indent before "(int)rqstp->rq_pool->sp_nrthreads"] Signed-off-by: Li Lingfeng <lilingfeng3(a)huawei.com> --- fs/nfsd/nfs4proc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 34d9931df6a4..b48856c0aa5a 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1827,10 +1827,8 @@ nfsd4_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, refcount_set(&async_copy->refcount, 1); /* Arbitrary cap on number of pending async copy operations */ if (atomic_inc_return(&nn->pending_async_copies) > - (int)rqstp->rq_pool->sp_nrthreads) { - atomic_dec(&nn->pending_async_copies); + (int)rqstp->rq_pool->sp_nrthreads) goto out_err; - } async_copy->cp_src = kmalloc(sizeof(*async_copy->cp_src), GFP_KERNEL); if (!async_copy->cp_src) goto out_err; -- 2.31.1

2 1