From: Scott Mayhew <smayhew@redhat.com>
To: steved@redhat.com
Cc: linux-nfs@vger.kernel.org
Subject: [nfs-utils PATCH 1/5] nfsdcld: Fix a few Coverity Scan RESOURCE_LEAK errors
Date: Fri, 10 Jul 2020 16:36:56 -0400 [thread overview]
Message-ID: <20200710203700.2546112-2-smayhew@redhat.com> (raw)
In-Reply-To: <20200710203700.2546112-1-smayhew@redhat.com>
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
---
utils/nfsdcld/legacy.c | 2 ++
utils/nfsdcld/nfsdcld.c | 1 +
utils/nfsdcld/sqlite.c | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/utils/nfsdcld/legacy.c b/utils/nfsdcld/legacy.c
index 3c6bea6..b8ea4ff 100644
--- a/utils/nfsdcld/legacy.c
+++ b/utils/nfsdcld/legacy.c
@@ -60,6 +60,7 @@ legacy_load_clients_from_recdir(int *num_records)
}
if (read(fd, recdirname, PATH_MAX) < 0) {
xlog(D_GENERAL, "Unable to read from %s: %m", NFSD_RECDIR_FILE);
+ close(fd);
return;
}
close(fd);
@@ -135,6 +136,7 @@ legacy_clear_recdir(void)
}
if (read(fd, recdirname, PATH_MAX) < 0) {
xlog(D_GENERAL, "Unable to read from %s: %m", NFSD_RECDIR_FILE);
+ close(fd);
return;
}
close(fd);
diff --git a/utils/nfsdcld/nfsdcld.c b/utils/nfsdcld/nfsdcld.c
index be65562..bb8e365 100644
--- a/utils/nfsdcld/nfsdcld.c
+++ b/utils/nfsdcld/nfsdcld.c
@@ -331,6 +331,7 @@ cld_check_grace_period(void)
if (read(fd, &c, 1) < 0) {
xlog(L_WARNING, "Unable to read from %s: %m",
NFSD_END_GRACE_FILE);
+ close(fd);
return 1;
}
close(fd);
diff --git a/utils/nfsdcld/sqlite.c b/utils/nfsdcld/sqlite.c
index 6666c86..e61e67c 100644
--- a/utils/nfsdcld/sqlite.c
+++ b/utils/nfsdcld/sqlite.c
@@ -380,7 +380,7 @@ sqlite_maindb_init_v4(void)
&err);
if (ret != SQLITE_OK) {
xlog(L_ERROR, "Unable to begin transaction: %s", err);
- return ret;
+ goto out;
}
/*
--
2.25.4
next prev parent reply other threads:[~2020-07-10 20:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-10 20:36 [nfs-utils PATCH 0/5] nfsdcld: Fix a number of Coverity Scan Scott Mayhew
2020-07-10 20:36 ` Scott Mayhew [this message]
2020-07-10 20:36 ` [nfs-utils PATCH 2/5] nfsdcld: Fix a few Coverity Scan TOCTOU errors Scott Mayhew
2020-07-10 20:36 ` [nfs-utils PATCH 3/5] nfsdcld: Fix a few Coverity Scan STRING_NULL errors Scott Mayhew
2020-07-10 20:36 ` [nfs-utils PATCH 4/5] nfsdcld: Fix a few Coverity Scan CLANG_WARNING errors Scott Mayhew
2020-07-10 20:37 ` [nfs-utils PATCH 5/5] nfsdcld: Fix a few Coverity Scan CHECKED_RETURN errors Scott Mayhew
2020-07-17 13:54 ` [nfs-utils PATCH 0/5] nfsdcld: Fix a number of Coverity Scan Steve Dickson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200710203700.2546112-2-smayhew@redhat.com \
--to=smayhew@redhat.com \
--cc=linux-nfs@vger.kernel.org \
--cc=steved@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).