Linux-NFS Archive on lore.kernel.org
 help / color / Atom feed
From: Steve Dickson <steved@redhat.com>
To: Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [PATCH 12/19] Removed resource leaks from blkmapd/device-discovery.c
Date: Wed,  8 May 2019 09:35:29 -0400
Message-ID: <20190508133536.6077-13-steved@redhat.com> (raw)
In-Reply-To: <20190508133536.6077-1-steved@redhat.com>

blkmapd/device-discovery.c:190: leaked_storage: Variable "serial"
	going out of scope leaks the storage it points to.

blkmapd/device-discovery.c:378: overwrite_var: Overwriting handle
	"bl_pipe_fd" in "bl_pipe_fd = open(bl_pipe_file, 2)" leaks the handle.

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 utils/blkmapd/device-discovery.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c
index 2ce60f8..e811703 100644
--- a/utils/blkmapd/device-discovery.c
+++ b/utils/blkmapd/device-discovery.c
@@ -186,8 +186,13 @@ static void bl_add_disk(char *filepath)
 		}
 	}
 
-	if (disk && diskpath)
+	if (disk && diskpath) {
+		if (serial) {
+			free(serial->data);
+			free(serial);
+		}
 		return;
+	}
 
 	/* add path */
 	path = malloc(sizeof(struct bl_disk_path));
@@ -223,6 +228,10 @@ static void bl_add_disk(char *filepath)
 			disk->size = size;
 			disk->valid_path = path;
 		}
+		if (serial) {
+			free(serial->data);
+			free(serial);
+		}
 	}
 	return;
 
@@ -232,6 +241,10 @@ static void bl_add_disk(char *filepath)
 			free(path->full_path);
 		free(path);
 	}
+	if (serial) {
+		free(serial->data);
+		free(serial);
+	}
 	return;
 }
 
@@ -375,7 +388,12 @@ static void bl_rpcpipe_cb(void)
 			if (event->mask & IN_CREATE) {
 				BL_LOG_WARNING("nfs pipe dir created\n");
 				bl_watch_dir(nfspipe_dir, &nfs_pipedir_wfd);
+				if (bl_pipe_fd >= 0)
+					close(bl_pipe_fd);
 				bl_pipe_fd = open(bl_pipe_file, O_RDWR);
+				if (bl_pipe_fd < 0)
+					BL_LOG_ERR("open %s failed: %s\n",
+						event->name, strerror(errno));
 			} else if (event->mask & IN_DELETE) {
 				BL_LOG_WARNING("nfs pipe dir deleted\n");
 				inotify_rm_watch(bl_watch_fd, nfs_pipedir_wfd);
@@ -388,6 +406,8 @@ static void bl_rpcpipe_cb(void)
 				continue;
 			if (event->mask & IN_CREATE) {
 				BL_LOG_WARNING("blocklayout pipe file created\n");
+				if (bl_pipe_fd >= 0)
+					close(bl_pipe_fd);
 				bl_pipe_fd = open(bl_pipe_file, O_RDWR);
 				if (bl_pipe_fd < 0)
 					BL_LOG_ERR("open %s failed: %s\n",
-- 
2.20.1


  parent reply index

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-08 13:35 [PATCH 00/19] Covertity Scan: Removed resources leaks Steve Dickson
2019-05-08 13:35 ` [PATCH 01/19] Removed resource leaks from junction/path.c Steve Dickson
2019-05-08 13:35 ` [PATCH 02/19] Removed resource leaks from nfs/exports.c Steve Dickson
2019-05-08 13:35 ` [PATCH 03/19] Removed a resource leak from nfs/mydaemon.c Steve Dickson
2019-05-08 13:35 ` [PATCH 04/19] Removed a resource leak from nfs/rpcmisc.c Steve Dickson
2019-05-08 13:35 ` [PATCH 05/19] Removed a resource leak from nfs/svc_socket.c Steve Dickson
2019-05-08 13:35 ` [PATCH 06/19] Removed bad frees from nfs/xcommon.c Steve Dickson
2019-05-08 13:35 ` [PATCH 07/19] Removed resource leaks from nfs/xlog.c Steve Dickson
2019-05-08 13:35 ` [PATCH 08/19] Removed resource leaks from nfsidmap/libnfsidmap.c Steve Dickson
2019-05-08 13:35 ` [PATCH 09/19] Removed resource leaks from nfsidmap/static.c Steve Dickson
2019-05-08 13:35 ` [PATCH 10/19] Removed a resource leak from nsm/file.c Steve Dickson
2019-05-08 13:35 ` [PATCH 11/19] Removed resource leaks from systemd/rpc-pipefs-generator.c Steve Dickson
2019-05-08 13:35 ` Steve Dickson [this message]
2019-05-08 13:35 ` [PATCH 13/19] Removed resource leaks from gssd/krb5_util.c Steve Dickson
2019-05-08 13:35 ` [PATCH 14/19] Removed a resource leak from mount/configfile.c Steve Dickson
2019-05-08 13:35 ` [PATCH 15/19] Removed a resource leak from mount/nfsmount.c Steve Dickson
2019-05-08 13:35 ` [PATCH 16/19] Removed a resource leak from mount/stropts.c Steve Dickson
2019-05-08 13:35 ` [PATCH 17/19] Removed resource leaks from mountd/cache.c Steve Dickson
2019-05-08 13:35 ` [PATCH 18/19] Removed a resource leak from mountd/fsloc.c Steve Dickson
2019-05-08 13:35 ` [PATCH 19/19] Removed a resource leak from nfsdcltrack/sqlite.c Steve Dickson
2019-05-10 15:07 ` [PATCH 00/19] Covertity Scan: Removed resources leaks Steve Dickson

Reply instructions:

You may reply publically 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=20190508133536.6077-13-steved@redhat.com \
    --to=steved@redhat.com \
    --cc=linux-nfs@vger.kernel.org \
    /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

Linux-NFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-nfs/0 linux-nfs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-nfs linux-nfs/ https://lore.kernel.org/linux-nfs \
		linux-nfs@vger.kernel.org linux-nfs@archiver.kernel.org
	public-inbox-index linux-nfs


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-nfs


AGPL code for this site: git clone https://public-inbox.org/ public-inbox