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

fix an double free in the error path from _stats_creat_group

Browse Source 
Signed-off-by: wuyifeng <wuyifeng10@huawei.com>
(cherry picked from commit d66f8e3a94b9521073e8901f761f254db033fd1e)
This commit is contained in:
wuyifeng 2023-12-15 09:47:59 +08:00 committed by openeuler-sync-bot
parent 5e929aca30
commit 243ac418a5
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
0032-clean-up-group-struct-in-_stats_create_group-error-path.patch Normal file
View File

@ -0,0 +1,43 @@
From eda99fc3839dcd439270ba5977ca6628bd9752cc Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr@redhat.com>
Date: Thu, 31 Aug 2023 16:59:02 +0100
Subject: [PATCH] Clean up group struct in _stats_create_group() error path
Conflict: NA
Reference: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=eda99fc3839dcd439270ba5977ca6628bd9752cc
Fix a double free in the error path from _stats_create_group() by
clearing the group struct embedded in the dm_stats handle before
returning:
device-mapper: message ioctl on (253:0) failed: Invalid argument
Could not create regions from file /var/tmp/File With Spaces.
free(): double free detected in tcache 2
Aborted (core dumped)
---
libdm/libdm-stats.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
index 62b28b69d..dc2907f4e 100644
--- a/libdm/libdm-stats.c
+++ b/libdm/libdm-stats.c
@@ -3908,9 +3908,14 @@ static int _stats_create_group(struct dm_stats *dms, dm_bitset_t regions,
/* force an update of the group tag stored in aux_data */
if (!_stats_set_aux(dms, *group_id, dms->regions[*group_id].aux_data))
- return 0;
+ goto bad;
return 1;
+bad:
+ group->group_id = DM_STATS_GROUP_NOT_PRESENT;
+ group->regions = NULL;
+ dm_free((char *) group->alias);
+ return 0;
}
static int _stats_group_check_overlap(const struct dm_stats *dms,
--
2.39.3

6
lvm2.spec
View File

@ -43,7 +43,7 @@
Name: lvm2
Version: 2.03.14
Release: 11
Release: 12
Epoch: 8
Summary: Tools for logical volume management
License: GPLv2+ and LGPLv2.1 and BSD
@ -80,6 +80,7 @@ Patch28: 0028-pvscan-use-alternate-device-names-from-DEVLINKS-to-c.patch
Patch29: 0029-vgchange-acquire-an-exclusive-VG-lock-for-refresh.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
Patch32: 0032-clean-up-group-struct-in-_stats_create_group-error-path.patch
BuildRequires: gcc
BuildRequires: gcc-c++
@ -506,6 +507,9 @@ fi
%changelog
* 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
* Tue Nov 14 2023 wangzhiqiang <wangzhiqiang95@huawei.com> - 8:2.03.14-11
- fix an issue for the symlink of the by-uuid file lost