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=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 D6331C4361B for ; Thu, 17 Dec 2020 03:34:51 +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 3BD5B23716 for ; Thu, 17 Dec 2020 03:34:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3BD5B23716 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=1608176089; 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=BvMikruKGo3+B+yc9EY437XhWsJcLks31cqwZTqsUxo=; b=D/+plmvDVbj4VJUKp3xK6cRVhEtWLduyS0SdxThYb2IZMJgyw3WNGhJQo1bOjQO3blG9i/ 80fUc0hqflECr7oiugltiA93yPLbN6wQ9tmbI0d0maapTsrVsbhfx5pGF6ujMODvCxEyyz taz63FTVeV/HIncNbh/9alZkGAk/go0= 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-302-HCQ1wQ43NfenEY9Xl-qBGw-1; Wed, 16 Dec 2020 22:34:47 -0500 X-MC-Unique: HCQ1wQ43NfenEY9Xl-qBGw-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 16581800D55; Thu, 17 Dec 2020 03:34:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF96F5D9CD; Thu, 17 Dec 2020 03:34:40 +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 CA4BE180954D; Thu, 17 Dec 2020 03:34:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0BH3Yau1012421 for ; Wed, 16 Dec 2020 22:34:36 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5520E60C47; Thu, 17 Dec 2020 03:34:36 +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 DAA5A60C15; Thu, 17 Dec 2020 03:34:29 +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 0BH3YSaS028185; Wed, 16 Dec 2020 21:34:28 -0600 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 0BH3YRwg028184; Wed, 16 Dec 2020 21:34:27 -0600 Date: Wed, 16 Dec 2020 21:34:27 -0600 From: Benjamin Marzinski To: mwilck@suse.com Message-ID: <20201217033427.GV3103@octiron.msp.redhat.com> References: <20201216181708.22224-1-mwilck@suse.com> <20201216181708.22224-23-mwilck@suse.com> MIME-Version: 1.0 In-Reply-To: <20201216181708.22224-23-mwilck@suse.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: dm-devel@redhat.com Cc: lixiaokeng@huawei.com, dm-devel@redhat.com Subject: Re: [dm-devel] [PATCH v3 22/29] multipath: fix leaks in check_path_valid() 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 Wed, Dec 16, 2020 at 07:17:01PM +0100, mwilck@suse.com wrote: > From: Martin Wilck > > There were two leaks in check_path_valid(): if path status was > successfully determined before calling store_pathvec(), free_path() > wasn't called. Also, if an error exit occured, neither cleanup > function was called. > > This patch fixes both, at the cost of using "static" for the pp and > pathvec variables. > > Signed-off-by: Martin Wilck > --- > multipath/main.c | 29 +++++++++++++++++++---------- > 1 file changed, 19 insertions(+), 10 deletions(-) > > diff --git a/multipath/main.c b/multipath/main.c > index 1949a1c..056e29a 100644 > --- a/multipath/main.c > +++ b/multipath/main.c > @@ -93,7 +93,7 @@ void rcu_register_thread_memb(void) {} > void rcu_unregister_thread_memb(void) {} > > static int > -filter_pathvec (vector pathvec, char * refwwid) > +filter_pathvec (vector pathvec, const char *refwwid) > { > int i; > struct path * pp; > @@ -594,8 +594,9 @@ static int > check_path_valid(const char *name, struct config *conf, bool is_uevent) > { > int fd, r = PATH_IS_ERROR; > - struct path *pp = NULL; > + struct path *pp; > vector pathvec = NULL; > + const char *wwid; > > pp = alloc_path(); > if (!pp) > @@ -665,13 +666,17 @@ check_path_valid(const char *name, struct config *conf, bool is_uevent) > if (store_path(pathvec, pp) != 0) { This will double-free the path, once here and again in cleanup. > free_path(pp); > goto fail; > + } else { > + /* make sure path isn't freed twice */ > + wwid = pp->wwid; > + pp = NULL; > } > > /* For find_multipaths = SMART, if there is more than one path > * matching the refwwid, then the path is valid */ > if (path_discovery(pathvec, DI_SYSFS | DI_WWID) < 0) > goto fail; > - filter_pathvec(pathvec, pp->wwid); > + filter_pathvec(pathvec, wwid); > if (VECTOR_SIZE(pathvec) > 1) > r = PATH_IS_VALID; > else > @@ -679,21 +684,25 @@ check_path_valid(const char *name, struct config *conf, bool is_uevent) > > out: > r = print_cmd_valid(r, pathvec, conf); > - free_pathvec(pathvec, FREE_PATHS); > /* > * multipath -u must exit with status 0, otherwise udev won't > * import its output. > */ > if (!is_uevent && r == PATH_IS_NOT_VALID) > - return RTVL_FAIL; > - return RTVL_OK; > + r = RTVL_FAIL; > + else > + r = RTVL_OK; > + goto cleanup; > > fail: > - if (pathvec) > + r = RTVL_FAIL; > + > +cleanup: > + if (pp != NULL) shouldn't this be free_path(pp) -Ben > + free(pp); > + if (pathvec != NULL) > free_pathvec(pathvec, FREE_PATHS); > - else > - free_path(pp); > - return RTVL_FAIL; > + return r; > } > > static int > -- > 2.29.0 -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel