dm-event: release buffer on dm_event_get_version
Signed-off-by: wangzhiqiang <wangzhiqiang95@huawei.com>
This commit is contained in:
parent
476cdda0df
commit
27798c2461
45
0016-dm-event-release-buffer-on-dm_event_get_version.patch
Normal file
45
0016-dm-event-release-buffer-on-dm_event_get_version.patch
Normal 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
|
||||||
@ -43,7 +43,7 @@
|
|||||||
|
|
||||||
Name: lvm2
|
Name: lvm2
|
||||||
Version: 2.03.22
|
Version: 2.03.22
|
||||||
Release: 1
|
Release: 2
|
||||||
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
|
||||||
@ -64,6 +64,7 @@ Patch12: 0012-lvm-code-reduce-cyclomatic-complexity.patch
|
|||||||
Patch13: 0013-udev-repeat.patch
|
Patch13: 0013-udev-repeat.patch
|
||||||
Patch14: 0014-use-sync-io-read-bcache-by-defaults.patch
|
Patch14: 0014-use-sync-io-read-bcache-by-defaults.patch
|
||||||
Patch15: 0015-vgchange-acquire-an-exclusive-VG-lock-for-refresh.patch
|
Patch15: 0015-vgchange-acquire-an-exclusive-VG-lock-for-refresh.patch
|
||||||
|
Patch16: 0016-dm-event-release-buffer-on-dm_event_get_version.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -490,6 +491,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 19 2023 wangzhiqiang <wangzhiqiang95@huawei.com> - 8:2.03.22-2
|
||||||
|
- dm-event: release buffer on dm_event_get_version
|
||||||
|
|
||||||
* Fri Nov 03 2023 liweigang <weigangli99@gmail.com> - 8:2.03.22-1
|
* Fri Nov 03 2023 liweigang <weigangli99@gmail.com> - 8:2.03.22-1
|
||||||
- update to version 2.03.22
|
- update to version 2.03.22
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user