From patchwork Thu Jun 16 09:47:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 9180345 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9A8D56088F for ; Thu, 16 Jun 2016 09:51:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C86020410 for ; Thu, 16 Jun 2016 09:51:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8097028354; Thu, 16 Jun 2016 09:51:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com [209.132.183.39]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E7C6520410 for ; Thu, 16 Jun 2016 09:51:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5G9mTr4006675; Thu, 16 Jun 2016 05:48:29 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u5G9lxi6005800 for ; Thu, 16 Jun 2016 05:47:59 -0400 Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com [10.5.110.39]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5G9lxim017390 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 16 Jun 2016 05:47:59 -0400 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EFA6E63303; Thu, 16 Jun 2016 09:47:58 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 7ACA6ADE9; Thu, 16 Jun 2016 09:47:53 +0000 (UTC) From: Hannes Reinecke To: Christophe Varoqui Date: Thu, 16 Jun 2016 11:47:40 +0200 Message-Id: <1466070465-1021-35-git-send-email-hare@suse.de> In-Reply-To: <1466070465-1021-1-git-send-email-hare@suse.de> References: <1466070465-1021-1-git-send-email-hare@suse.de> X-Greylist: Sender IP whitelisted by DNSRBL, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 16 Jun 2016 09:47:59 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 16 Jun 2016 09:47:59 +0000 (UTC) for IP:'195.135.220.15' DOMAIN:'mx2.suse.de' HELO:'mx2.suse.de' FROM:'hare@suse.de' RCPT:'' X-RedHat-Spam-Score: -3.327 (BAYES_50, DCC_REPUT_00_12, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, SPF_PASS) 195.135.220.15 mx2.suse.de 195.135.220.15 mx2.suse.de X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.39 X-loop: dm-devel@redhat.com Cc: Hannes Reinecke , dm-devel@redhat.com Subject: [dm-devel] [PATCH 34/39] multipathd: pid fd resource leak 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: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Virus-Scanned: ClamAV using ClamSMTP We open a PID filedescriptor, but never close them. While this is not an error per se coverity complains here. So be a good guy and close the PID fd properly. Signed-off-by: Hannes Reinecke --- multipathd/main.c | 6 +++++- multipathd/pidfile.c | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/multipathd/main.c b/multipathd/main.c index 0eadd70..8285f0d 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -2085,6 +2085,7 @@ child (void * param) unsigned long checkint; #endif int rc; + int pid_fd = -1; char *envp; mlockall(MCL_CURRENT | MCL_FUTURE); @@ -2101,7 +2102,8 @@ child (void * param) log_thread_start(&log_attr); pthread_attr_destroy(&log_attr); } - if (pidfile_create(DEFAULT_PIDFILE, daemon_pid)) { + pid_fd = pidfile_create(DEFAULT_PIDFILE, daemon_pid); + if (pid_fd < 0) { condlog(1, "failed to create pidfile"); if (logsink == 1) log_thread_stop(); @@ -2307,6 +2309,8 @@ failed: #ifdef USE_SYSTEMD sd_notify(0, "ERRNO=1"); #endif + if (pid_fd >= 0) + close(pid_fd); exit(1); } diff --git a/multipathd/pidfile.c b/multipathd/pidfile.c index e3fb896..e911358 100644 --- a/multipathd/pidfile.c +++ b/multipathd/pidfile.c @@ -22,7 +22,7 @@ int pidfile_create(const char *pidFile, pid_t pid) (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH))) < 0) { condlog(0, "Cannot open pidfile [%s], error was [%s]", pidFile, strerror(errno)); - return 1; + return -errno; } lock.l_type = F_WRLCK; lock.l_start = 0; @@ -60,8 +60,8 @@ int pidfile_create(const char *pidFile, pid_t pid) "error was [%s]", pidFile, strerror(errno)); goto fail; } - return 0; + return fd; fail: close(fd); - return 1; + return -errno; }