From 450bb7605b2c4686f3573a4eec55727eb0fe785a Mon Sep 17 00:00:00 2001
From: Ziye Yang <ziye.yang@intel.com>
Date: Tue, 7 Jun 2016 10:19:06 +0800
Subject: [PATCH] nvmf: replace all malloc with calloc in nvmf library

Change-Id: Ibf6719996ef683d8efc82068b2294ce0f75c54f9
Signed-off-by: Ziye Yang <ziye.yang@intel.com>
---
 lib/nvmf/conf.c    | 14 ++++++--------
 lib/nvmf/session.c |  5 ++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/lib/nvmf/conf.c b/lib/nvmf/conf.c
index 7fdf6ab49..ac84cf61e 100644
--- a/lib/nvmf/conf.c
+++ b/lib/nvmf/conf.c
@@ -118,14 +118,14 @@ spdk_nvmf_parse_addr(char *listen_addr, char **host, char **port)
 		}
 		p++;
 		n = p - listen_addr;
-		*host = malloc(n + 1);
+		*host = calloc(1, n + 1);
 		if (!*host) {
 			return -1;
 		}
 		memcpy(*host, listen_addr, n);
 		(*host)[n] = '\0';
 		if (p[0] == '\0') {
-			*port = malloc(PORTNUMSTRLEN);
+			*port = calloc(1, PORTNUMSTRLEN);
 			if (!*port) {
 				free(*host);
 				return -1;
@@ -142,12 +142,11 @@ spdk_nvmf_parse_addr(char *listen_addr, char **host, char **port)
 			}
 			len = q - p - 1;
 
-			*port = malloc(len + 1);
+			*port = calloc(1, len + 1);
 			if (!*port) {
 				free(*host);
 				return -1;
 			}
-			memset(*port, 0, len + 1);
 			memcpy(*port, p + 1, len);
 		}
 	} else {
@@ -157,14 +156,14 @@ spdk_nvmf_parse_addr(char *listen_addr, char **host, char **port)
 			p = listen_addr + strlen(listen_addr);
 		}
 		n = p - listen_addr;
-		*host = malloc(n + 1);
+		*host = calloc(1, n + 1);
 		if (!*host) {
 			return -1;
 		}
 		memcpy(*host, listen_addr, n);
 		(*host)[n] = '\0';
 		if (p[0] == '\0') {
-			*port = malloc(PORTNUMSTRLEN);
+			*port = calloc(1, PORTNUMSTRLEN);
 			if (!*port) {
 				free(*host);
 				return -1;
@@ -186,12 +185,11 @@ spdk_nvmf_parse_addr(char *listen_addr, char **host, char **port)
 			}
 
 			len = q - p - 1;
-			*port = malloc(len + 1);
+			*port = calloc(1, len + 1);
 			if (!*port) {
 				free(*host);
 				return -1;
 			}
-			memset(*port, 0, len + 1);
 			memcpy(*port, p + 1, len);
 
 		}
diff --git a/lib/nvmf/session.c b/lib/nvmf/session.c
index 526cb23ba..49bf6a30f 100644
--- a/lib/nvmf/session.c
+++ b/lib/nvmf/session.c
@@ -53,10 +53,9 @@ nvmf_create_session(const char *subnqn)
 	if (subsystem == NULL)
 		return NULL;
 
-	session = malloc(sizeof(struct nvmf_session));
+	session = calloc(1, sizeof(struct nvmf_session));
 	if (session == NULL)
 		goto exit;
-	memset(session, 0, sizeof(struct nvmf_session));
 
 	subsystem->num_sessions++;
 	/* define cntlid that is unique across all subsystems */
@@ -235,7 +234,7 @@ nvmf_connect(void *fabric_conn,
 	struct nvmf_session *session;
 	struct nvmf_connection_entry *connection = NULL;
 
-	connection = malloc(sizeof(struct nvmf_connection_entry));
+	connection = calloc(1, sizeof(struct nvmf_connection_entry));
 	if (connection == NULL)
 		goto connect_fail;