packages/lvm2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!136 [sync] PR-132: dm-event: release buffer on dm_event_get_version

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @swf504 
Signed-off-by: @swf504
This commit is contained in:
openeuler-ci-bot 2023-12-19 07:18:42 +00:00 committed by Gitee
commit ed6008ebc0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
0033-dm-event-release-buffer-on-dm_event_get_version.patch Normal file
View File

@ -0,0 +1,45 @@
From a203499ba32aabec0e8a9002517e1608e4e83b2c Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Mon, 25 Sep 2023 11:47:40 +0200
Subject: [PATCH] dm-event: release buffer on dm_event_get_version
Avoid memory leak in this function.
---
daemons/dmeventd/libdevmapper-event.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c
index 9e4dd2469..0aabc03e6 100644
--- a/daemons/dmeventd/libdevmapper-event.c
+++ b/daemons/dmeventd/libdevmapper-event.c
@@ -844,6 +844,7 @@ int dm_event_get_registered_device(struct dm_event_handler *dmevh, int next)
int dm_event_get_version(struct dm_event_fifos *fifos, int *version) {
char *p;
struct dm_event_daemon_message msg = { 0 };
+ int ret = 0;
if (daemon_talk(fifos, &msg, DM_EVENT_CMD_HELLO, NULL, NULL, 0, 0))
return 0;
@@ -851,13 +852,17 @@ int dm_event_get_version(struct dm_event_fifos *fifos, int *version) {
*version = 0;
if (!p || !(p = strchr(p, ' '))) /* Message ID */
- return 0;
+ goto out;
if (!(p = strchr(p + 1, ' '))) /* HELLO */
- return 0;
+ goto out;
if ((p = strchr(p + 1, ' '))) /* HELLO, once more */
*version = atoi(p);
- return 1;
+ ret = 1;
+out:
+ free(msg.data);
+
+ return ret;
}
void dm_event_log_set(int debug_log_level, int use_syslog)
--
2.39.3

6
lvm2.spec
View File

@ -43,7 +43,7 @@
Name: lvm2 Name: lvm2
Version: 2.03.14 Version: 2.03.14
Release: 12 Release: 13
Epoch: 8 Epoch: 8
Summary: Tools for logical volume management Summary: Tools for logical volume management
License: GPLv2+ and LGPLv2.1 and BSD License: GPLv2+ and LGPLv2.1 and BSD
@ -81,6 +81,7 @@ Patch29: 0029-vgchange-acquire-an-exclusive-VG-lock-for-refresh.patch
Patch30: 0030-udev-create-symlinks-and-watch-even-in-suspended-sta.patch Patch30: 0030-udev-create-symlinks-and-watch-even-in-suspended-sta.patch
Patch31: 0031-udev-import-previous-results-of-blkid-when-in-suspen.patch Patch31: 0031-udev-import-previous-results-of-blkid-when-in-suspen.patch
Patch32: 0032-clean-up-group-struct-in-_stats_create_group-error-path.patch 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
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -507,6 +508,9 @@ fi
%changelog %changelog
* Tue Dec 19 2023 wangzhiqiang <wangzhiqiang95@huawei.com> - 8:2.03.14-13
- dm-event: release buffer on dm_event_get_version
* Fri Dec 15 2023 wuyifeng <wuyifeng10@huawei.com> - 8:2.03.14-12 * Fri Dec 15 2023 wuyifeng <wuyifeng10@huawei.com> - 8:2.03.14-12
- fix an double free in the error path from _stats_creat_group - fix an double free in the error path from _stats_creat_group