3ec0ebefcd
- Update Source to latest upstream commit
* Previous patches 0001-0011 are included in this commit
- Rename files
* Previous patches 0012-0019 are now patches 0021-0028
- Add 0001-libmultipath-fix-tur-checker-timeout.patch
- Add 0002-libmultipath-fix-tur-checker-double-locking.patch
- Add 0003-libmultipath-fix-tur-memory-misuse.patch
- Add 0004-libmultipath-cleanup-tur-locking.patch
- Add 0005-libmultipath-fix-tur-checker-timeout-issue.patch
* The above 5 patches cleanup locking issues with the
tur checker threads
- Add 0006-libmultipath-fix-set_int-error-path.patch
- Add 0007-libmultipath-fix-length-issues-in-get_vpd_sgio.patch
- Add 0008-libmultipath-_install_keyword-cleanup.patch
- Add 0009-libmultipath-remove-unused-code.patch
- Add 0010-libmultipath-fix-memory-issue-in-path_latency-prio.patch
- Add 0011-libmultipath-fix-null-dereference-int-alloc_path_gro.patch
- Add 0012-libmutipath-don-t-use-malformed-uevents.patch
- Add 0013-multipath-fix-max-array-size-in-print_cmd_valid.patch
- Add 0014-multipathd-function-return-value-tweaks.patch
- Add 0015-multipathd-minor-fixes.patch
- Add 0016-multipathd-remove-useless-check-and-fix-format.patch
- Add 0017-multipathd-fix-memory-leak-on-error-in-configure.patch
* The above 12 patches fix minor issues found by coverity
- Add 0018-libmultipath-Don-t-blank-intialized-paths.patch
- Add 0019-libmultipath-Fixup-updating-paths.patch
* Fix issues with paths whose wwid was not set or later changes
- Add 0020-multipath-tweak-logging-style.patch
* multipathd interactive commands now send errors to stderr, instead
of syslog
* The above 20 patches have been submitted upstream
68 lines
1.5 KiB
Diff
68 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Tue, 31 Jul 2018 16:35:53 -0500
|
|
Subject: [PATCH] multipathd: fix memory leak on error in configure
|
|
|
|
If configure fails after allocing mpvec, it must free it. Found by
|
|
coverity.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
multipathd/main.c | 12 ++++++++----
|
|
1 file changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/multipathd/main.c b/multipathd/main.c
|
|
index 3c2fe7b..61ca455 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -2277,7 +2277,7 @@ configure (struct vectors * vecs)
|
|
ret = path_discovery(vecs->pathvec, DI_ALL);
|
|
if (ret < 0) {
|
|
condlog(0, "configure failed at path discovery");
|
|
- return 1;
|
|
+ goto fail;
|
|
}
|
|
|
|
vector_foreach_slot (vecs->pathvec, pp, i){
|
|
@@ -2294,7 +2294,7 @@ configure (struct vectors * vecs)
|
|
}
|
|
if (map_discovery(vecs)) {
|
|
condlog(0, "configure failed at map discovery");
|
|
- return 1;
|
|
+ goto fail;
|
|
}
|
|
|
|
/*
|
|
@@ -2308,7 +2308,7 @@ configure (struct vectors * vecs)
|
|
force_reload = FORCE_RELOAD_YES;
|
|
if (ret) {
|
|
condlog(0, "configure failed while coalescing paths");
|
|
- return 1;
|
|
+ goto fail;
|
|
}
|
|
|
|
/*
|
|
@@ -2317,7 +2317,7 @@ configure (struct vectors * vecs)
|
|
*/
|
|
if (coalesce_maps(vecs, mpvec)) {
|
|
condlog(0, "configure failed while coalescing maps");
|
|
- return 1;
|
|
+ goto fail;
|
|
}
|
|
|
|
dm_lib_release();
|
|
@@ -2353,6 +2353,10 @@ configure (struct vectors * vecs)
|
|
i--;
|
|
}
|
|
return 0;
|
|
+
|
|
+fail:
|
|
+ vector_free(mpvec);
|
|
+ return 1;
|
|
}
|
|
|
|
int
|
|
--
|
|
2.7.4
|
|
|