1dad67a5af
Update Source to upstream version 0.8.5 plus post tag commits
* Patches 0001-0102 are from
https://github.com/openSUSE/multipath-tools/tree/queue and are
already queued for upstream.
Rename files
* Previous patches 0059-0068 are now patches 0103-0111
118 lines
3.5 KiB
Diff
118 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: lixiaokeng <lixiaokeng@huawei.com>
|
|
Date: Mon, 9 Nov 2020 12:32:05 +0800
|
|
Subject: [PATCH] libmultipath: fix memory leaks in coalesce_paths
|
|
|
|
When multipath -F are executed first and multipath -v2 or
|
|
-d are executed later, asan will warn memory leaks. The
|
|
reason is that the mpp allocated in coalesce_paths isn't
|
|
freed. Here we use newmp to store mpp. If newmp need not
|
|
be copied to mpvec, we free newmp at the end of the func.
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Lixiaokeng <lixiaokeng@huawei.com>
|
|
Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
|
|
Signed-off-by: Linfeilong <linfeilong@huawei.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/configure.c | 40 +++++++++++++++++++++++++++++-----------
|
|
1 file changed, 29 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/libmultipath/configure.c b/libmultipath/configure.c
|
|
index 1c8aac08..d36f0d0d 100644
|
|
--- a/libmultipath/configure.c
|
|
+++ b/libmultipath/configure.c
|
|
@@ -1139,7 +1139,7 @@ out:
|
|
* FORCE_RELOAD_WEAK: existing maps are compared to the current conf and only
|
|
* reloaded in DM if there's a difference. This is useful during startup.
|
|
*/
|
|
-int coalesce_paths (struct vectors * vecs, vector newmp, char * refwwid,
|
|
+int coalesce_paths (struct vectors *vecs, vector mpvec, char *refwwid,
|
|
int force_reload, enum mpath_cmds cmd)
|
|
{
|
|
int ret = CP_FAIL;
|
|
@@ -1151,6 +1151,7 @@ int coalesce_paths (struct vectors * vecs, vector newmp, char * refwwid,
|
|
struct path * pp2;
|
|
vector curmp = vecs->mpvec;
|
|
vector pathvec = vecs->pathvec;
|
|
+ vector newmp;
|
|
struct config *conf;
|
|
int allow_queueing;
|
|
struct bitfield *size_mismatch_seen;
|
|
@@ -1171,6 +1172,15 @@ int coalesce_paths (struct vectors * vecs, vector newmp, char * refwwid,
|
|
if (size_mismatch_seen == NULL)
|
|
return CP_FAIL;
|
|
|
|
+ if (mpvec)
|
|
+ newmp = mpvec;
|
|
+ else
|
|
+ newmp = vector_alloc();
|
|
+ if (!newmp) {
|
|
+ condlog(0, "can not allocate newmp");
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
vector_foreach_slot (pathvec, pp1, k) {
|
|
int invalid;
|
|
|
|
@@ -1283,8 +1293,14 @@ int coalesce_paths (struct vectors * vecs, vector newmp, char * refwwid,
|
|
goto out;
|
|
}
|
|
}
|
|
- if (r == DOMAP_DRY)
|
|
+ if (r == DOMAP_DRY) {
|
|
+ if (!vector_alloc_slot(newmp)) {
|
|
+ remove_map(mpp, vecs->pathvec, vecs->mpvec, KEEP_VEC);
|
|
+ goto out;
|
|
+ }
|
|
+ vector_set_slot(newmp, mpp);
|
|
continue;
|
|
+ }
|
|
|
|
if (r == DOMAP_EXIST && mpp->action == ACT_NOTHING &&
|
|
force_reload == FORCE_RELOAD_WEAK)
|
|
@@ -1320,22 +1336,22 @@ int coalesce_paths (struct vectors * vecs, vector newmp, char * refwwid,
|
|
print_multipath_topology(mpp, verbosity);
|
|
}
|
|
|
|
- if (newmp) {
|
|
- if (mpp->action != ACT_REJECT) {
|
|
- if (!vector_alloc_slot(newmp))
|
|
- goto out;
|
|
- vector_set_slot(newmp, mpp);
|
|
+ if (mpp->action != ACT_REJECT) {
|
|
+ if (!vector_alloc_slot(newmp)) {
|
|
+ remove_map(mpp, vecs->pathvec, vecs->mpvec, KEEP_VEC);
|
|
+ goto out;
|
|
}
|
|
- else
|
|
- remove_map(mpp, vecs->pathvec, vecs->mpvec,
|
|
- KEEP_VEC);
|
|
+ vector_set_slot(newmp, mpp);
|
|
}
|
|
+ else
|
|
+ remove_map(mpp, vecs->pathvec, vecs->mpvec,
|
|
+ KEEP_VEC);
|
|
}
|
|
/*
|
|
* Flush maps with only dead paths (ie not in sysfs)
|
|
* Keep maps with only failed paths
|
|
*/
|
|
- if (newmp) {
|
|
+ if (mpvec) {
|
|
vector_foreach_slot (newmp, mpp, i) {
|
|
char alias[WWID_SIZE];
|
|
|
|
@@ -1358,6 +1374,8 @@ int coalesce_paths (struct vectors * vecs, vector newmp, char * refwwid,
|
|
ret = CP_OK;
|
|
out:
|
|
free(size_mismatch_seen);
|
|
+ if (!mpvec)
|
|
+ free_multipathvec(newmp, KEEP_PATHS);
|
|
return ret;
|
|
}
|
|
|
|
--
|
|
2.17.2
|
|
|