!219 [sync] PR-218: [同步] config: check for 0 from read

From: @openeuler-sync-bot 
Reviewed-by: @liubo254 
Signed-off-by: @liubo254

0022-dmstats-Fix-memory-leak-on-error-path.patch

@@ -0,0 +1,25 @@
+From d1f0b89e65fd8817930bbf89051fe03efb0a1db5 Mon Sep 17 00:00:00 2001
+From: Marian Csontos <mcsontos@redhat.com>
+Date: Tue, 28 Nov 2023 21:41:35 +0100
+Subject: [PATCH] dmstats: Fix memory leak on error path
+
+---
+ libdm/libdm-stats.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
+index dc2907f..62be5de 100644
+--- a/libdm/libdm-stats.c
++++ b/libdm/libdm-stats.c
+@@ -1970,7 +1970,7 @@ static int _stats_create_region(struct dm_stats *dms, uint64_t *region_id,
+ 				 (strlen(hist_arg)) ? HISTOGRAM_ARG : "",
+ 				 hist_arg)) < 0) {
+ 			log_error(err_fmt, PRECISE_ARG " option.");
+-			return 0;
++			goto out;
+ 		}
+ 	} else
+ 		opt_args = dm_strdup("");
+-- 
+2.27.0
+

0023-fix-function-undeclared-in-libdm-common.c-and-dev-cache.c.patch

@@ -0,0 +1,37 @@
+From e5ce6e143393fe50da73eabdf32ce3dafb7b9dd7 Mon Sep 17 00:00:00 2001
+From: yuncang123 <1050706328@qq.com>
+Date: Sat, 7 Sep 2024 18:34:09 +0800
+Subject: [PATCH] fix function undeclared in libdm-common.c and dev-cache.c
+
+---
+ lib/device/dev-cache.c | 1 +
+ libdm/libdm-common.c   | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c
+index 85f9b49..ee39814 100644
+--- a/lib/device/dev-cache.c
++++ b/lib/device/dev-cache.c
+@@ -31,6 +31,7 @@
+ #include <locale.h>
+ /* coverity[unnecessary_header] needed for MuslC */
+ #include <sys/file.h>
++#include <sys/time.h>
+ 
+ struct dev_iter {
+ 	struct btree_iter *current;
+diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
+index 734a012..177dc40 100644
+--- a/libdm/libdm-common.c
++++ b/libdm/libdm-common.c
+@@ -24,6 +24,7 @@
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+ #include <dirent.h>
++#include <syslog.h>
+ 
+ #ifdef UDEV_SYNC_SUPPORT
+ #  include <sys/types.h>
+-- 
+2.43.0
+

0024-config-check-for-0-from-read.patch

@@ -0,0 +1,31 @@
+From 713310b93d85ffd01aae26f3d878a8b0453fa506 Mon Sep 17 00:00:00 2001
+From: Zdenek Kabelac <zkabelac@redhat.com>
+Date: Wed, 29 Jan 2025 00:00:23 +0100
+Subject: [PATCH] config: check for 0 from read
+
+When the read returns 0, it could mean the file
+was trimmed or some other type of problem.
+In this case abort the potentially endless loop.
+
+Reference: https://github.com/lvmteam/lvm2/commit/e907c3cf9a1c294b6551d525d58f2bd7dbbb1cc5
+Conflict: NA
+---
+ lib/config/config.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/config/config.c b/lib/config/config.c
+index 5986e64..02c757e 100644
+--- a/lib/config/config.c
++++ b/lib/config/config.c
+@@ -536,7 +536,7 @@ int config_file_read_fd(struct dm_config_tree *cft, struct device *dev, dev_io_r
+ 				sz = read(dev_fd(dev), buf + rsize, size - rsize);
+ 			} while ((sz < 0) && ((errno == EINTR) || (errno == EAGAIN)));
+ 
+-			if (sz < 0) {
++			if (sz <= 0) {
+ 				log_sys_error("read", dev_name(dev));
+ 				goto out;
+ 			}
+-- 
+2.33.0
+

lvm2.spec

@@ -43,7 +43,7 @@
 
 Name:      lvm2
 Version:   2.03.21
-Release:   11
+Release:   15
 Epoch:     8
 Summary:   Tools for logical volume management
 License:   GPLv2+ and LGPLv2.1 and BSD
@@ -70,6 +70,9 @@ Patch18:   0018-do-not-pass-empty-string-in-callback.patch
 Patch19:   0019-fix-memleak-in-vgchange.patch
 Patch20:   0020-udev-create-dev-disk-by-label-symlinks-for-DM-devs-t.patch
 Patch21:   0021-lvmcache-fix-memleaks-on-list-removal.patch
+Patch22:   0022-dmstats-Fix-memory-leak-on-error-path.patch
+Patch23:   0023-fix-function-undeclared-in-libdm-common.c-and-dev-cache.c.patch
+Patch24:   0024-config-check-for-0-from-read.patch
 
 BuildRequires: gcc
 BuildRequires: gcc-c++
@@ -486,7 +489,7 @@ fi
 %{_sysconfdir}/dbus-1/system.d/com.redhat.lvmdbus1.conf
 %{_datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service
 %{_unitdir}/lvm2-lvmdbusd.service
-%{python3_sitelib}/lvmdbusd/*
+%{python3_sitelib}/lvmdbusd
 
 %files test
 %license COPYING COPYING.LIB COPYING.BSD
@@ -496,6 +499,26 @@ fi
 
 
 %changelog
+* Thu Apr 03 2025 chenrenhui <chenrenhui1@huawei.com> - 8:2.03.21-15
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:check for 0 from read
+
+* Tue Nov 05 2024 shenzhongwei <shenzhongwei@kylinos.cn> - 8:2.03.21-14
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:Avoid unowned %%{python3_sitelib}/lvmdbusd directory 
+
+* Fri Oct 25 2024 yuanchao <1050706328@qq.com> - 8:2.03.21-13
+- support clang build:
+  - fix function undeclared in libdm-common.c and dev-cache.c
+  - fix changelog to be in descending chronological order
+
+* Wed Oct 23 2024 yanshuai <yanshuai@kylinos.cn> - 8:2.03.21-12
+- dmstats: Fix memory leak on error path
+
 * Tue Aug 6 2024 kouwenqi <kouwenqi@kylinos.cn> - 8:2.03.21-11
 - lvmcache: fix memleaks on list removal
 
@@ -517,7 +540,7 @@ fi
 * Mon Jan 22 2024 peng.zou <peng.zou@shingroup.cn> - 8:2.03.22-4
 - lvm2-lockd: add suport for ppc64le
 
-* Wed Nov 22 2023 wangxiaomeng <wangxiaomeng@kylinos.cn> - 8:2.03.22-3
+* Tue Jan 9 2024 wangxiaomeng <wangxiaomeng@kylinos.cn> - 8:2.03.22-3
 - lvmlockd: add suport for loongarch64
 
 * Tue Dec 19 2023 wangzhiqiang <wangzhiqiang95@huawei.com> - 8:2.03.22-2

lvm2.yaml

@@ -1,4 +1,4 @@
 version_control: git
-src_repo: git://sourceware.org/git/lvm2.git 
+src_repo: git://gitlab.com/lvmteam/lvm2
 tag_prefix: "^v"
 seperator: "_"