From patchwork Thu Sep 24 13:40:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 11797463 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 961E7139A for ; Thu, 24 Sep 2020 13:45:00 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.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 29F562344C for ; Thu, 24 Sep 2020 13:45:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 29F562344C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com 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-517-ydud-OJeP82cR3oSht-r7w-1; Thu, 24 Sep 2020 09:44:52 -0400 X-MC-Unique: ydud-OJeP82cR3oSht-r7w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F8E7188C126; Thu, 24 Sep 2020 13:44:46 +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 42FE455786; Thu, 24 Sep 2020 13:44:46 +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 1760E1826D31; Thu, 24 Sep 2020 13:44:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08ODfn8s026923 for ; Thu, 24 Sep 2020 09:41:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4C61B2157F26; Thu, 24 Sep 2020 13:41:49 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 479812157F24 for ; Thu, 24 Sep 2020 13:41:47 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7DB5D801184 for ; Thu, 24 Sep 2020 13:41:47 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-439-AFLA0PrAP_ayNDdmMDLHaw-1; Thu, 24 Sep 2020 09:41:44 -0400 X-MC-Unique: AFLA0PrAP_ayNDdmMDLHaw-1 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 1F5B3B1E9; Thu, 24 Sep 2020 13:41:43 +0000 (UTC) From: mwilck@suse.com To: Christophe Varoqui , Benjamin Marzinski Date: Thu, 24 Sep 2020 15:40:53 +0200 Message-Id: <20200924134054.14632-23-mwilck@suse.com> In-Reply-To: <20200924134054.14632-1-mwilck@suse.com> References: <20200924134054.14632-1-mwilck@suse.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 08ODfn8s026923 X-loop: dm-devel@redhat.com Cc: lixiaokeng@huawei.com, dm-devel@redhat.com, Martin Wilck Subject: [dm-devel] [PATCH 22/23] 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.15 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 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 | 55 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/multipath/main.c b/multipath/main.c index 049a36f..9974993 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; @@ -592,12 +592,37 @@ out: return r; } +static void cleanup_pathvec(__attribute__((unused)) int dummy, void *arg) +{ + vector *ppv = arg; + + if (ppv && *ppv) { + free_pathvec(*ppv, FREE_PATHS); + *ppv = NULL; + } +} + +static void cleanup_path(__attribute__((unused)) int dummy, void *arg) +{ + struct path **ppp = arg; + + if (ppp && *ppp) { + free_path(*ppp); + *ppp = NULL; + } +} + static int check_path_valid(const char *name, struct config *conf, bool is_uevent) { int fd, r = PATH_IS_ERROR; - struct path *pp = NULL; - vector pathvec = NULL; + static struct path *pp = NULL; + static vector pathvec = NULL; + const char *wwid; + + /* register these as exit handlers in case we exit irregularly */ + on_exit(cleanup_path, &pp); + on_exit(cleanup_pathvec, &pathvec); pp = alloc_path(); if (!pp) @@ -667,13 +692,17 @@ check_path_valid(const char *name, struct config *conf, bool is_uevent) if (store_path(pathvec, pp) != 0) { 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 @@ -681,21 +710,23 @@ 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) - free_pathvec(pathvec, FREE_PATHS); - else - free_path(pp); - return RTVL_FAIL; + r = RTVL_FAIL; + +cleanup: + cleanup_path(0, &pp); + cleanup_pathvec(0, &pathvec); + return r; } static int