From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Benjamin Marzinski" Subject: [PATCH v3 17/19] multipathd: fix memory leak on error in configure Date: Fri, 21 Sep 2018 18:05:25 -0500 Message-ID: <1537571127-10143-18-git-send-email-bmarzins@redhat.com> References: <1537571127-10143-1-git-send-email-bmarzins@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1537571127-10143-1-git-send-email-bmarzins@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com To: device-mapper development Cc: Martin Wilck List-Id: dm-devel.ids If configure fails after allocing mpvec, it must free it. Found by coverity. 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 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