December 2023 - Kernel - mailweb.openeuler.org

[PATCH openEuler-22.03-LTS-SP2 v3] netfilter: nft_set_pipapo: skip inactive elements during set walk
by Dong Chenchen 27 Dec '23

27 Dec '23

From: Florian Westphal <fw(a)strlen.de> stable inclusion from stable-v5.10.203 commit bf72b44fe81be08a9fcd58aabf417cd3337ffc99 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8PGNK CVE: CVE-2023-6817 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 317eb9685095678f2c9f5a8189de698c5354316a upstream. Otherwise set elements can be deactivated twice which will cause a crash. Reported-by: Xingyuan Mo <hdthky0(a)gmail.com> Fixes: 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges") Signed-off-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Conflicts: net/netfilter/nft_set_pipapo.c Signed-off-by: Dong Chenchen <dongchenchen2(a)huawei.com> --- net/netfilter/nft_set_pipapo.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c index 3be93175b3ff..08fc65ca31d4 100644 --- a/net/netfilter/nft_set_pipapo.c +++ b/net/netfilter/nft_set_pipapo.c @@ -1984,6 +1984,9 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set, if (nft_set_elem_expired(&e->ext)) goto cont; + if (!nft_set_elem_active(&e->ext, iter->genmask)) + goto cont; + elem.priv = e; iter->err = iter->fn(ctx, set, iter, &elem); -- 2.25.1

2 1

[PATCH OLK-6.6] openeuler_defconfig: enable CONFIG_EROFS_FS_ONDEMAND for x86 and arm64
by Baokun Li 27 Dec '23

27 Dec '23

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8RP48 -------------------------------- Enable CONFIG_EROFS_FS_ONDEMAND on x86 and arm64 by default to support lazy loading, and also enable the dependent CONFIG_CACHEFILES_ONDEMAND and CONFIG_EROFS_FS. Signed-off-by: Baokun Li <libaokun1(a)huawei.com> --- arch/arm64/configs/openeuler_defconfig | 8 ++++++-- arch/x86/configs/openeuler_defconfig | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig index 9297e3ca9f92..fe5e81f6eede 100644 --- a/arch/arm64/configs/openeuler_defconfig +++ b/arch/arm64/configs/openeuler_defconfig @@ -6843,7 +6843,7 @@ CONFIG_FSCACHE_STATS=y CONFIG_CACHEFILES=m # CONFIG_CACHEFILES_DEBUG is not set # CONFIG_CACHEFILES_ERROR_INJECTION is not set -# CONFIG_CACHEFILES_ONDEMAND is not set +CONFIG_CACHEFILES_ONDEMAND=y # end of Caches # @@ -6949,7 +6949,11 @@ CONFIG_PSTORE_RAM=m # CONFIG_PSTORE_BLK is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS=m +# CONFIG_EROFS_FS_DEBUG is not set +# CONFIG_EROFS_FS_XATTR is not set +# CONFIG_EROFS_FS_ZIP is not set +CONFIG_EROFS_FS_ONDEMAND=y CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m CONFIG_NFS_V2=m diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig index c7b4a4b80b66..f660a490d921 100644 --- a/arch/x86/configs/openeuler_defconfig +++ b/arch/x86/configs/openeuler_defconfig @@ -8048,7 +8048,7 @@ CONFIG_FSCACHE_STATS=y CONFIG_CACHEFILES=m # CONFIG_CACHEFILES_DEBUG is not set # CONFIG_CACHEFILES_ERROR_INJECTION is not set -# CONFIG_CACHEFILES_ONDEMAND is not set +CONFIG_CACHEFILES_ONDEMAND=y # end of Caches # @@ -8157,7 +8157,11 @@ CONFIG_PSTORE_RAM=m # CONFIG_PSTORE_BLK is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set -# CONFIG_EROFS_FS is not set +CONFIG_EROFS_FS=m +# CONFIG_EROFS_FS_DEBUG is not set +# CONFIG_EROFS_FS_XATTR is not set +# CONFIG_EROFS_FS_ZIP is not set +CONFIG_EROFS_FS_ONDEMAND=y CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m # CONFIG_NFS_V2 is not set -- 2.31.1

2 1

[PATCH OLK-6.6 0/1] optimize inlining
by Yuntao Liu 27 Dec '23

27 Dec '23

From: Yuntao Liu liuyuntao12(a)huawei.com *** BLURB HERE *** Jinjie Ruan (1): optimize inlining arch/arm64/kvm/sys_regs.h | 5 +++++ arch/x86/configs/i386_defconfig | 1 + arch/x86/configs/x86_64_defconfig | 1 + drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h | 5 ++++- .../pci/hive_isp_css_include/print_support.h | 4 ++++ include/linux/compiler_types.h | 6 +++++- include/trace/trace_events.h | 2 +- kernel/configs/tiny.config | 1 + lib/Kconfig.debug | 13 +++++++++++++ 9 files changed, 35 insertions(+), 3 deletions(-) -- 2.34.1

2 2

[PATCH OLK-5.10 v3] netfilter: nft_set_pipapo: skip inactive elements during set walk
by Dong Chenchen 27 Dec '23

27 Dec '23

From: Florian Westphal <fw(a)strlen.de> stable inclusion from stable-v5.10.203 commit bf72b44fe81be08a9fcd58aabf417cd3337ffc99 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8PGNK CVE: CVE-2023-6817 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 317eb9685095678f2c9f5a8189de698c5354316a upstream. Otherwise set elements can be deactivated twice which will cause a crash. Reported-by: Xingyuan Mo <hdthky0(a)gmail.com> Fixes: 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges") Signed-off-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Conflicts: net/netfilter/nft_set_pipapo.c Signed-off-by: Dong Chenchen <dongchenchen2(a)huawei.com> --- net/netfilter/nft_set_pipapo.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c index 3be93175b3ff..08fc65ca31d4 100644 --- a/net/netfilter/nft_set_pipapo.c +++ b/net/netfilter/nft_set_pipapo.c @@ -1984,6 +1984,9 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set, if (nft_set_elem_expired(&e->ext)) goto cont; + if (!nft_set_elem_active(&e->ext, iter->genmask)) + goto cont; + elem.priv = e; iter->err = iter->fn(ctx, set, iter, &elem); -- 2.25.1

2 1

[PATCH OLK-5.10 v2] netfilter: nft_set_pipapo: skip inactive elements during set walk
by Dong Chenchen 27 Dec '23

27 Dec '23

From: Florian Westphal <fw(a)strlen.de> stable inclusion from stable-v5.10.203 commit bf72b44fe81be08a9fcd58aabf417cd3337ffc99 category: bugfix bugzilla: 189434 CVE: CVE-2023-6817 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 317eb9685095678f2c9f5a8189de698c5354316a upstream. Otherwise set elements can be deactivated twice which will cause a crash. Reported-by: Xingyuan Mo <hdthky0(a)gmail.com> Fixes: 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges") Signed-off-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Conflicts: net/netfilter/nft_set_pipapo.c Signed-off-by: Dong Chenchen <dongchenchen2(a)huawei.com> --- net/netfilter/nft_set_pipapo.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c index 3be93175b3ff..08fc65ca31d4 100644 --- a/net/netfilter/nft_set_pipapo.c +++ b/net/netfilter/nft_set_pipapo.c @@ -1984,6 +1984,9 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set, if (nft_set_elem_expired(&e->ext)) goto cont; + if (!nft_set_elem_active(&e->ext, iter->genmask)) + goto cont; + elem.priv = e; iter->err = iter->fn(ctx, set, iter, &elem); -- 2.25.1

2 1

[PATCH openEuler-22.03-LTS-SP2 v2] netfilter: nft_set_pipapo: skip inactive elements during set walk
by Dong Chenchen 27 Dec '23

27 Dec '23

From: Florian Westphal <fw(a)strlen.de> stable inclusion from stable-v5.10.203 commit bf72b44fe81be08a9fcd58aabf417cd3337ffc99 category: bugfix bugzilla: 189434 CVE: CVE-2023-6817 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 317eb9685095678f2c9f5a8189de698c5354316a upstream. Otherwise set elements can be deactivated twice which will cause a crash. Reported-by: Xingyuan Mo <hdthky0(a)gmail.com> Fixes: 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges") Signed-off-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Conflicts: net/netfilter/nft_set_pipapo.c Signed-off-by: Dong Chenchen <dongchenchen2(a)huawei.com> --- net/netfilter/nft_set_pipapo.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c index 3be93175b3ff..08fc65ca31d4 100644 --- a/net/netfilter/nft_set_pipapo.c +++ b/net/netfilter/nft_set_pipapo.c @@ -1984,6 +1984,9 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set, if (nft_set_elem_expired(&e->ext)) goto cont; + if (!nft_set_elem_active(&e->ext, iter->genmask)) + goto cont; + elem.priv = e; iter->err = iter->fn(ctx, set, iter, &elem); -- 2.25.1

2 1

[PATCH openEuler-22.03-LTS-SP1 v2] netfilter: nft_set_pipapo: skip inactive elements during set walk
by Dong Chenchen 27 Dec '23

27 Dec '23

From: Florian Westphal <fw(a)strlen.de> stable inclusion from stable-v5.10.203 commit bf72b44fe81be08a9fcd58aabf417cd3337ffc99 category: bugfix bugzilla: 189434 CVE: CVE-2023-6817 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 317eb9685095678f2c9f5a8189de698c5354316a upstream. Otherwise set elements can be deactivated twice which will cause a crash. Reported-by: Xingyuan Mo <hdthky0(a)gmail.com> Fixes: 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges") Signed-off-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Conflicts: net/netfilter/nft_set_pipapo.c Signed-off-by: Dong Chenchen <dongchenchen2(a)huawei.com> --- net/netfilter/nft_set_pipapo.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c index 3be93175b3ff..08fc65ca31d4 100644 --- a/net/netfilter/nft_set_pipapo.c +++ b/net/netfilter/nft_set_pipapo.c @@ -1984,6 +1984,9 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set, if (nft_set_elem_expired(&e->ext)) goto cont; + if (!nft_set_elem_active(&e->ext, iter->genmask)) + goto cont; + elem.priv = e; iter->err = iter->fn(ctx, set, iter, &elem); -- 2.25.1

2 1

[PATCH openEuler-22.03-LTS v2] netfilter: nft_set_pipapo: skip inactive elements during set walk
by Dong Chenchen 27 Dec '23

27 Dec '23

From: Florian Westphal <fw(a)strlen.de> stable inclusion from stable-v5.10.203 commit bf72b44fe81be08a9fcd58aabf417cd3337ffc99 category: bugfix bugzilla: 189434 CVE: CVE-2023-6817 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 317eb9685095678f2c9f5a8189de698c5354316a upstream. Otherwise set elements can be deactivated twice which will cause a crash. Reported-by: Xingyuan Mo <hdthky0(a)gmail.com> Fixes: 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges") Signed-off-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Conflicts: net/netfilter/nft_set_pipapo.c Signed-off-by: Dong Chenchen <dongchenchen2(a)huawei.com> --- net/netfilter/nft_set_pipapo.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c index 3be93175b3ff..08fc65ca31d4 100644 --- a/net/netfilter/nft_set_pipapo.c +++ b/net/netfilter/nft_set_pipapo.c @@ -1984,6 +1984,9 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set, if (nft_set_elem_expired(&e->ext)) goto cont; + if (!nft_set_elem_active(&e->ext, iter->genmask)) + goto cont; + elem.priv = e; iter->err = iter->fn(ctx, set, iter, &elem); -- 2.25.1

2 1

[PATCH openEuler-22.03-LTS-SP1] netfilter: nft_set_pipapo: skip inactive elements during set walk
by Dong Chenchen 27 Dec '23

27 Dec '23

From: Florian Westphal <fw(a)strlen.de> stable inclusion from stable-5.10.203 commit bf72b44fe81be08a9fcd58aabf417cd3337ffc99 category: bugfix bugzilla: 189434 CVE: CVE-2023-6817 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 317eb9685095678f2c9f5a8189de698c5354316a upstream. Otherwise set elements can be deactivated twice which will cause a crash. Reported-by: Xingyuan Mo <hdthky0(a)gmail.com> Fixes: 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges") Signed-off-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Conflicts: net/netfilter/nft_set_pipapo.c Signed-off-by: Dong Chenchen <dongchenchen2(a)huawei.com> --- net/netfilter/nft_set_pipapo.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c index 3be93175b3ff..08fc65ca31d4 100644 --- a/net/netfilter/nft_set_pipapo.c +++ b/net/netfilter/nft_set_pipapo.c @@ -1984,6 +1984,9 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set, if (nft_set_elem_expired(&e->ext)) goto cont; + if (!nft_set_elem_active(&e->ext, iter->genmask)) + goto cont; + elem.priv = e; iter->err = iter->fn(ctx, set, iter, &elem); -- 2.25.1

2 1

[PATCH openEuler-22.03-LTS-SP2] netfilter: nft_set_pipapo: skip inactive elements during set walk
by Dong Chenchen 27 Dec '23

27 Dec '23

From: Florian Westphal <fw(a)strlen.de> stable inclusion from stable-5.10.203 commit bf72b44fe81be08a9fcd58aabf417cd3337ffc99 category: bugfix bugzilla: 189434 CVE: CVE-2023-6817 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id… -------------------------------- commit 317eb9685095678f2c9f5a8189de698c5354316a upstream. Otherwise set elements can be deactivated twice which will cause a crash. Reported-by: Xingyuan Mo <hdthky0(a)gmail.com> Fixes: 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges") Signed-off-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Conflicts: net/netfilter/nft_set_pipapo.c Signed-off-by: Dong Chenchen <dongchenchen2(a)huawei.com> --- net/netfilter/nft_set_pipapo.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c index 3be93175b3ff..08fc65ca31d4 100644 --- a/net/netfilter/nft_set_pipapo.c +++ b/net/netfilter/nft_set_pipapo.c @@ -1984,6 +1984,9 @@ static void nft_pipapo_walk(const struct nft_ctx *ctx, struct nft_set *set, if (nft_set_elem_expired(&e->ext)) goto cont; + if (!nft_set_elem_active(&e->ext, iter->genmask)) + goto cont; + elem.priv = e; iter->err = iter->fn(ctx, set, iter, &elem); -- 2.25.1

2 1

2024

2023

2022

2021

2020

2019

Kernel December 2023