From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A3A8C433E7 for ; Fri, 16 Oct 2020 17:31:58 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5ADE020E65 for ; Fri, 16 Oct 2020 17:31:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="L7NGIraE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5ADE020E65 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602869515; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=9Yl/vYLGC+1W3tpAVRwdB8+I58ixKlzj25NJSTkxIWk=; b=L7NGIraEH6fa9bnNINnn0Fgc3U3+A3Yn96nirETqCnaoOO9s8R9fMt5jSDEvBsiS1OsevF 3P8cfAb2I07m1qI05itCWjg+6ZMapzrbuc9jF6VzDkAzKFC9DM9sm4vpM6JwvzWn8C1/+3 ZaYyBZyACymkMB34ZlQxfpcx6YwsTXs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-10-j61nBaFpMN-iN0COKoMpBA-1; Fri, 16 Oct 2020 13:31:53 -0400 X-MC-Unique: j61nBaFpMN-iN0COKoMpBA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 09C88186DD27; Fri, 16 Oct 2020 17:31:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1FE4D5D9CC; Fri, 16 Oct 2020 17:31:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4231E58118; Fri, 16 Oct 2020 17:31:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09GHVgat007607 for ; Fri, 16 Oct 2020 13:31:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6386055775; Fri, 16 Oct 2020 17:31:42 +0000 (UTC) Received: from octiron.msp.redhat.com (octiron.msp.redhat.com [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BFDE475130; Fri, 16 Oct 2020 17:31:38 +0000 (UTC) Received: from octiron.msp.redhat.com (localhost.localdomain [127.0.0.1]) by octiron.msp.redhat.com (8.14.9/8.14.9) with ESMTP id 09GHVb19026116; Fri, 16 Oct 2020 12:31:37 -0500 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 09GHVaQ1026115; Fri, 16 Oct 2020 12:31:36 -0500 Date: Fri, 16 Oct 2020 12:31:36 -0500 From: Benjamin Marzinski To: lixiaokeng Message-ID: <20201016173136.GU3384@octiron.msp.redhat.com> References: <6169bcfa-343d-adc8-a458-5e5c46aed737@huawei.com> MIME-Version: 1.0 In-Reply-To: <6169bcfa-343d-adc8-a458-5e5c46aed737@huawei.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: dm-devel@redhat.com Cc: linfeilong , dm-devel mailing list , Martin Wilck , "liuzhiqiang \(I\)" Subject: Re: [dm-devel] [PATCH] libmultipath: fix memory leaks in coalesce_paths X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Fri, Oct 16, 2020 at 02:23:58PM +0800, lixiaokeng wrote: > When multipath -F are executed firstly 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 add newmp in configure(multipath) to store > mpp and free it. > > Signed-off-by: Lixiaokeng > Signed-off-by: Zhiqiang Liu > Signed-off-by: Linfeilong > --- > libmultipath/configure.c | 12 ++++++++++-- > multipath/main.c | 7 +++++-- > 2 files changed, 15 insertions(+), 4 deletions(-) > > diff --git a/libmultipath/configure.c b/libmultipath/configure.c > index 6fb477fc..fb2c3f73 100644 > --- a/libmultipath/configure.c > +++ b/libmultipath/configure.c > @@ -1270,8 +1270,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) > @@ -1309,8 +1315,10 @@ int coalesce_paths (struct vectors * vecs, vector newmp, char * refwwid, > > if (newmp) { > if (mpp->action != ACT_REJECT) { > - if (!vector_alloc_slot(newmp)) > + if (!vector_alloc_slot(newmp)) { > + remove_map(mpp, vecs->pathvec, vecs->mpvec, KEEP_VEC); > goto out; > + } > vector_set_slot(newmp, mpp); > } > else > diff --git a/multipath/main.c b/multipath/main.c > index 9e920d89..5f5b435a 100644 > --- a/multipath/main.c > +++ b/multipath/main.c You should rebase this on top of Martin's "libmultipath: improve cleanup on exit" patchset, since it conflicts with those patches. He's just posted another version of them. -Ben > @@ -472,6 +472,7 @@ configure (struct config *conf, enum mpath_cmds cmd, > { > vector curmp = NULL; > vector pathvec = NULL; > + vector newmp = NULL; > struct vectors vecs; > int r = RTVL_FAIL, rc; > int di_flag = 0; > @@ -483,8 +484,9 @@ configure (struct config *conf, enum mpath_cmds cmd, > */ > curmp = vector_alloc(); > pathvec = vector_alloc(); > + newmp = vector_alloc(); > > - if (!curmp || !pathvec) { > + if (!curmp || !pathvec || !newmp) { > condlog(0, "can not allocate memory"); > goto out; > } > @@ -586,7 +588,7 @@ configure (struct config *conf, enum mpath_cmds cmd, > /* > * core logic entry point > */ > - rc = coalesce_paths(&vecs, NULL, refwwid, > + rc = coalesce_paths(&vecs, newmp, refwwid, > conf->force_reload, cmd); > r = rc == CP_RETRY ? RTVL_RETRY : rc == CP_OK ? RTVL_OK : RTVL_FAIL; > > @@ -595,6 +597,7 @@ out: > FREE(refwwid); > > free_multipathvec(curmp, KEEP_PATHS); > + free_multipathvec(newmp, KEEP_PATHS); > free_pathvec(pathvec, FREE_PATHS); > > return r; > -- -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel