!217 [sync] PR-215: config: check for 0 from read

From: @openeuler-sync-bot 
Reviewed-by: @liubo254 
Signed-off-by: @liubo254
This commit is contained in:
openeuler-ci-bot 2025-04-03 09:11:25 +00:00 committed by Gitee
commit bc6a2975d1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,30 @@
From c3c212d2185c0e185a536f9380e33bccc44f09a4 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/e907c3cf9a1c294b6551d525d58f3bd7dbbb1cc5
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 0cb0da1..a4c3fe6 100644
--- a/lib/config/config.c
+++ b/lib/config/config.c
@@ -534,7 +534,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

View File

@ -43,7 +43,7 @@
Name: lvm2
Version: 2.03.14
Release: 17
Release: 18
Epoch: 8
Summary: Tools for logical volume management
License: GPLv2+ and LGPLv2.1 and BSD
@ -84,6 +84,7 @@ Patch32: 0032-clean-up-group-struct-in-_stats_create_group-error-path.patch
Patch33: 0033-dm-event-release-buffer-on-dm_event_get_version.patch
Patch34: 0034-dmstats-Fix-memory-leak-on-error-path.patch
Patch35: 0035-fix-function-undeclared-in-libdm-common.c-and-dev-cache.c.patch
Patch36: 0036-config-check-for-0-from-read.patch
BuildRequires: gcc
BuildRequires: gcc-c++
@ -510,6 +511,9 @@ fi
%changelog
* Fri Mar 28 2025 chenrenhui <chenrenhui1@huawei.com> - 8:2.03.14-18
- config: check for 0 from read
* Mon Nov 18 2024 yanshuai <yanshuai@kylinos.cn> - 8:2.03.14-17
- Avoid unowned %%{python3_sitelib}/lvmdbusd directory