4 files changed, 34 insertions, 9 deletions
diff --git a/xlators/nfs/server/src/acl3.c b/xlators/nfs/server/src/acl3.c
index 50cd82dd422..3745188c7a5 100644
--- a/xlators/nfs/server/src/acl3.c
+++ b/xlators/nfs/server/src/acl3.c
@@ -571,6 +571,12 @@ acl3_setacl_resume(void *carg)
     acl3_check_fh_resolve_status(cs, stat, acl3err);
     nfs_request_user_init(&nfu, cs->req);
     xattr = dict_new();
+    if (xattr == NULL) {
+        gf_msg(GF_NLM, GF_LOG_ERROR, ENOMEM, NFS_MSG_GFID_DICT_CREATE_FAIL,
+               "dict allocation failed");
+        goto acl3err;
+    }
+
     if (cs->aclcount)
         ret = dict_set_static_bin(xattr, POSIX_ACL_ACCESS_XATTR, cs->aclxattr,
                                   posix_acl_xattr_size(cs->aclcount));
@@ -724,7 +730,6 @@ acl3svc_init(xlator_t *nfsx)
     struct nfs_state *nfs = NULL;
     dict_t *options = NULL;
     int ret = -1;
-    char *portstr = NULL;
     static gf_boolean_t acl3_inited = _gf_false;
 
     /* Already inited */
@@ -742,12 +747,14 @@ acl3svc_init(xlator_t *nfsx)
     acl3prog.private = ns;
 
     options = dict_new();
-
-    ret = gf_asprintf(&portstr, "%d", GF_ACL3_PORT);
-    if (ret == -1)
+    if (options == NULL) {
+        gf_msg(GF_ACL, GF_LOG_ERROR, ENOMEM, NFS_MSG_GFID_DICT_CREATE_FAIL,
+               "dict allocation failed");
         goto err;
+    }
 
-    ret = dict_set_dynstr(options, "transport.socket.listen-port", portstr);
+    ret = dict_set_dynstr(options, "transport.socket.listen-port",
+                          GF_ACL3_PORT);
     if (ret == -1)
         goto err;
     ret = dict_set_str(options, "transport-type", "socket");
@@ -783,7 +790,6 @@ acl3svc_init(xlator_t *nfsx)
     if (ret == -1) {
         gf_msg(GF_ACL, GF_LOG_ERROR, errno, NFS_MSG_LISTENERS_CREATE_FAIL,
                "Unable to create listeners");
-        dict_unref(options);
         goto err;
     }
 
diff --git a/xlators/nfs/server/src/acl3.h b/xlators/nfs/server/src/acl3.h
index dead04b4273..762fbb04a0f 100644
--- a/xlators/nfs/server/src/acl3.h
+++ b/xlators/nfs/server/src/acl3.h
@@ -18,7 +18,7 @@
 #define ACL3_SETACL 2
 #define ACL3_PROC_COUNT 3
 
-#define GF_ACL3_PORT 38469
+#define GF_ACL3_PORT "38469"
 #define GF_ACL GF_NFS "-ACL"
 
 /* Flags for the getacl/setacl mode */
diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c
index 88d3002a752..a34d9104c17 100644
--- a/xlators/nfs/server/src/mount3.c
+++ b/xlators/nfs/server/src/mount3.c
@@ -4062,6 +4062,11 @@ mnt3svc_init(xlator_t *nfsx)
 
     mnt3prog.private = mstate;
     options = dict_new();
+    if (options == NULL) {
+        gf_msg(GF_NFS, GF_LOG_ERROR, ENOMEM, NFS_MSG_GFID_DICT_CREATE_FAIL,
+               "dict allocation failed");
+        goto err;
+    }
 
     ret = gf_asprintf(&portstr, "%d", GF_MOUNTV3_PORT);
     if (ret == -1)
@@ -4097,7 +4102,6 @@ mnt3svc_init(xlator_t *nfsx)
     if (ret == -1) {
         gf_msg(GF_NFS, GF_LOG_ERROR, errno, NFS_MSG_LISTENERS_CREATE_FAIL,
                "Unable to create listeners");
-        dict_unref(options);
         goto err;
     }
 
@@ -4162,6 +4166,11 @@ mnt1svc_init(xlator_t *nfsx)
     mnt1prog.private = mstate;
 
     options = dict_new();
+    if (options == NULL) {
+        gf_msg(GF_NFS, GF_LOG_ERROR, ENOMEM, NFS_MSG_GFID_DICT_CREATE_FAIL,
+               "dict allocation failed");
+        goto err;
+    }
 
     ret = gf_asprintf(&portstr, "%d", GF_MOUNTV1_PORT);
     if (ret == -1)
diff --git a/xlators/nfs/server/src/nlm4.c b/xlators/nfs/server/src/nlm4.c
index ef65d7f55f8..c909e3bc093 100644
--- a/xlators/nfs/server/src/nlm4.c
+++ b/xlators/nfs/server/src/nlm4.c
@@ -1054,6 +1054,12 @@ nlm4_establish_callback(nfs3_call_state_t *cs, call_frame_t *cbk_frame)
     }
 
     options = dict_new();
+    if (options == NULL) {
+        gf_msg(GF_NLM, GF_LOG_ERROR, ENOMEM, NFS_MSG_GFID_DICT_CREATE_FAIL,
+               "dict allocation failed");
+        goto err;
+    }
+
     ret = dict_set_str(options, "transport-type", "socket");
     if (ret == -1) {
         gf_msg(GF_NLM, GF_LOG_ERROR, errno, NFS_MSG_DICT_SET_FAILED,
@@ -2592,6 +2598,11 @@ nlm4svc_init(xlator_t *nfsx)
     nlm4prog.private = ns;
 
     options = dict_new();
+    if (options == NULL) {
+        gf_msg(GF_NLM, GF_LOG_ERROR, ENOMEM, NFS_MSG_GFID_DICT_CREATE_FAIL,
+               "dict allocation failed");
+        goto err;
+    }
 
     ret = gf_asprintf(&portstr, "%d", GF_NLM4_PORT);
     if (ret == -1)
@@ -2633,7 +2644,6 @@ nlm4svc_init(xlator_t *nfsx)
     if (ret == -1) {
         gf_msg(GF_NLM, GF_LOG_ERROR, errno, NFS_MSG_LISTENERS_CREATE_FAIL,
                "Unable to create listeners");
-        dict_unref(options);
         goto err;
     }
     INIT_LIST_HEAD(&nlm_client_list);