From 3b8da487d534eb49c8c59d1a9c2d6199c0716572 Mon Sep 17 00:00:00 2001 From: Benjamin Marzinski Date: Tue, 9 Oct 2018 18:03:14 -0500 Subject: [PATCH] multipathd: fix memory leak on error in configure If configure fails after allocing mpvec, it must free it. Found by coverity. Reviewed-by: Martin Wilck Signed-off-by: Benjamin Marzinski --- multipathd/main.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/multipathd/main.c b/multipathd/main.c index 463b1b82..04dce04c 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -2278,7 +2278,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){ @@ -2295,7 +2295,7 @@ configure (struct vectors * vecs) } if (map_discovery(vecs)) { condlog(0, "configure failed at map discovery"); - return 1; + goto fail; } /* @@ -2309,7 +2309,7 @@ configure (struct vectors * vecs) force_reload = FORCE_RELOAD_YES; if (ret) { condlog(0, "configure failed while coalescing paths"); - return 1; + goto fail; } /* @@ -2318,7 +2318,7 @@ configure (struct vectors * vecs) */ if (coalesce_maps(vecs, mpvec)) { condlog(0, "configure failed while coalescing maps"); - return 1; + goto fail; } dm_lib_release(); @@ -2354,6 +2354,10 @@ configure (struct vectors * vecs) i--; } return 0; + +fail: + vector_free(mpvec); + return 1; } int -- 2.20.1