NULL dereference fixes in code base after running with 'clang'

* 212 logical (NULL deref/divide by zero) errors reduced to 28
  (27 of them in contrib/ and lex part of codebase, 1 is invalid)
* 11 API errors reduced to 0

Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 966 (NULL check for avoiding NULL dereferencing of pointers..)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=966

10 files changed, 82 insertions, 54 deletions

diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c
index 58d23779cc1..1c239d0cb0f 100644
--- a/xlators/protocol/client/src/client-handshake.c
+++ b/xlators/protocol/client/src/client-handshake.c
@@ -520,7 +520,7 @@ client_setvolume (xlator_t *this, struct rpc_clnt *rpc)
         options = this->options;
         conf    = this->private;
 
-        if (conf->fops || !dict_get (options, "fops-version")) {
+        if (conf->fops) {
                 ret = dict_set_int32 (options, "fops-version",
                                       conf->fops->prognum);
                 if (ret < 0) {
diff --git a/xlators/protocol/client/src/client3_1-fops.c b/xlators/protocol/client/src/client3_1-fops.c
index f91eebaddc6..5204ef032da 100644
--- a/xlators/protocol/client/src/client3_1-fops.c
+++ b/xlators/protocol/client/src/client3_1-fops.c
@@ -280,7 +280,6 @@ client3_1_mkdir_cbk (struct rpc_req *req, struct iovec *iov, int count,
         }
 
 out:
-        frame->local = NULL;
         STACK_UNWIND_STRICT (mkdir, frame, rsp.op_ret,
                              gf_error_to_errno (rsp.op_errno), inode,
                              &stbuf, &preparent, &postparent);
@@ -2115,9 +2114,11 @@ client_fdctx_destroy (xlator_t *this, clnt_fd_ctx_t *fdctx)
         }
 
 out:
-        fdctx->remote_fd = -1;
-        inode_unref (fdctx->inode);
-        GF_FREE (fdctx);
+        if (fdctx) {
+                fdctx->remote_fd = -1;
+                inode_unref (fdctx->inode);
+                GF_FREE (fdctx);
+        }
 
         return ret;
 }
@@ -2237,8 +2238,10 @@ out:
         if (fdctx)
                 client_fdctx_destroy (frame->this, fdctx);
 
-        frame->local = NULL;
-        STACK_DESTROY (frame->root);
+        if (frame) {
+                frame->local = NULL;
+                STACK_DESTROY (frame->root);
+        }
 
         client_local_wipe (local);
 
@@ -2555,15 +2558,16 @@ client3_1_lookup (call_frame_t *frame, xlator_t *this,
         return 0;
 
 unwind:
-        frame->local = NULL;
+        if (frame)
+                frame->local = NULL;
+
         STACK_UNWIND_STRICT (lookup, frame, -1, op_errno, NULL, NULL, NULL, NULL);
 
         if (local)
                 client_local_wipe (local);
 
-        if (req.dict.dict_val) {
+        if (req.dict.dict_val)
                 GF_FREE (req.dict.dict_val);
-        }
 
         return 0;
 }
@@ -2900,8 +2904,11 @@ client3_1_symlink (call_frame_t *frame, xlator_t *this,
 
         return 0;
 unwind:
-        frame->local = NULL;
+        if (frame)
+                frame->local = NULL;
+
         STACK_UNWIND_STRICT (symlink, frame, -1, op_errno, NULL, NULL, NULL, NULL);
+
         if (local)
                 client_local_wipe (local);
         return 0;
@@ -3074,8 +3081,11 @@ client3_1_mknod (call_frame_t *frame, xlator_t *this,
 
         return 0;
 unwind:
-        frame->local = NULL;
+        if (frame)
+                frame->local = NULL;
+
         STACK_UNWIND_STRICT (mknod, frame, -1, op_errno, NULL, NULL, NULL, NULL);
+
         if (local)
                 client_local_wipe (local);
         return 0;
@@ -3130,8 +3140,11 @@ client3_1_mkdir (call_frame_t *frame, xlator_t *this,
 
         return 0;
 unwind:
-        frame->local = NULL;
+        if (frame)
+                frame->local = NULL;
+
         STACK_UNWIND_STRICT (mkdir, frame, -1, op_errno, NULL, NULL, NULL, NULL);
+
         if (local)
                 client_local_wipe (local);
         return 0;
@@ -3187,7 +3200,9 @@ client3_1_create (call_frame_t *frame, xlator_t *this,
 
         return 0;
 unwind:
-        frame->local = NULL;
+        if (frame)
+                frame->local = NULL;
+
         STACK_UNWIND_STRICT (create, frame, -1, op_errno, NULL, NULL, NULL, NULL, NULL);
         if (local)
                 client_local_wipe (local);
@@ -3243,8 +3258,11 @@ client3_1_open (call_frame_t *frame, xlator_t *this,
 
         return 0;
 unwind:
-        frame->local = NULL;
+        if (frame)
+                frame->local = NULL;
+
         STACK_UNWIND_STRICT (open, frame, -1, op_errno, NULL);
+
         if (local)
                 client_local_wipe (local);
         return 0;
@@ -3555,7 +3573,8 @@ client3_1_opendir (call_frame_t *frame, xlator_t *this,
 
         return 0;
 unwind:
-        frame->local = NULL;
+        if (frame)
+                frame->local = NULL;
         STACK_UNWIND_STRICT (opendir, frame, -1, op_errno, NULL);
         if (local)
                 client_local_wipe (local);
diff --git a/xlators/protocol/legacy/client/src/client-protocol.c b/xlators/protocol/legacy/client/src/client-protocol.c
index dae31dcb356..0dc5bee5d56 100644
--- a/xlators/protocol/legacy/client/src/client-protocol.c
+++ b/xlators/protocol/legacy/client/src/client-protocol.c
@@ -302,6 +302,8 @@ call_bail (void *data)
                         gf_ops = gf_cbks;
                         gf_op_list = gf_cbk_list;
                         break;
+                default:
+                        goto out;
                 }
 
                 localtime_r (&trav->saved_at.tv_sec, &frame_sent_tm);
@@ -3255,6 +3257,9 @@ client_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc,
         client_local_t      *local = NULL;
         char                *buf = NULL;
 
+        GF_VALIDATE_OR_GOTO (this->name, loc, unwind);
+        GF_VALIDATE_OR_GOTO (this->name, loc->path, unwind);
+
         local = GF_CALLOC (1, sizeof (*local), gf_client_mt_client_local_t);
         GF_VALIDATE_OR_GOTO (this->name, local, unwind);
 
@@ -3262,9 +3267,6 @@ client_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc,
 
         frame->local = local;
 
-        GF_VALIDATE_OR_GOTO (this->name, loc, unwind);
-        GF_VALIDATE_OR_GOTO (this->name, loc->path, unwind);
-
         if (loc->ino != 1 && loc->parent) {
                 ret = inode_ctx_get2 (loc->parent, this, &par, &gen);
                 if (loc->parent->ino && ret < 0) {
@@ -3319,7 +3321,7 @@ client_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc,
         return ret;
 
 unwind:
-        STACK_UNWIND (frame, op_ret, op_errno, loc->inode, NULL, NULL);
+        STACK_UNWIND (frame, op_ret, op_errno, (loc)?loc->inode:NULL, NULL, NULL);
         return ret;
 }
 
diff --git a/xlators/protocol/legacy/server/src/server-helpers.c b/xlators/protocol/legacy/server/src/server-helpers.c
index 7ab2ce88531..595916a3656 100644
--- a/xlators/protocol/legacy/server/src/server-helpers.c
+++ b/xlators/protocol/legacy/server/src/server-helpers.c
@@ -427,15 +427,17 @@ server_connection_destroy (xlator_t *this, server_connection_t *conn)
                 INIT_LIST_HEAD (&file_lockers);
                 INIT_LIST_HEAD (&dir_lockers);
 
-                LOCK (&ltable->lock);
-                {
-                        list_splice_init (&ltable->file_lockers,
-                                          &file_lockers);
+                if (ltable) {
+                        LOCK (&ltable->lock);
+                        {
+                                list_splice_init (&ltable->file_lockers,
+                                                  &file_lockers);
 
-                        list_splice_init (&ltable->dir_lockers, &dir_lockers);
+                                list_splice_init (&ltable->dir_lockers, &dir_lockers);
+                        }
+                        UNLOCK (&ltable->lock);
+                        GF_FREE (ltable);
                 }
-                UNLOCK (&ltable->lock);
-                GF_FREE (ltable);
 
                 flock.l_type  = F_UNLCK;
                 flock.l_start = 0;
diff --git a/xlators/protocol/legacy/server/src/server-protocol.c b/xlators/protocol/legacy/server/src/server-protocol.c
index 6a48dff390a..da0303019a3 100644
--- a/xlators/protocol/legacy/server/src/server-protocol.c
+++ b/xlators/protocol/legacy/server/src/server-protocol.c
@@ -147,7 +147,7 @@ server_print_params (char *str, int size, server_state_t *state)
                                     "wbflags=%d,", state->wbflags);
         if (state->size)
                 filled += snprintf (str + filled, size - filled,
-                                    "size=%Zu,", state->size);
+                                    "size=%zu,", state->size);
         if (state->offset)
                 filled += snprintf (str + filled, size - filled,
                                     "offset=%"PRId64",", state->offset);
@@ -667,8 +667,8 @@ server_fentrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
         gf_errno        = gf_errno_to_error (op_errno);
         hdr->rsp.op_errno = hton32 (gf_errno);
 
+        state = CALL_STATE(frame);
         if (op_ret >= 0) {
-                state = CALL_STATE(frame);
                 if (state->cmd == ENTRYLK_UNLOCK)
                         gf_del_locker (conn->ltable, state->volume,
                                        NULL, state->fd, frame->root->pid);
@@ -5656,7 +5656,7 @@ mop_setvolume (call_frame_t *frame, xlator_t *bound_xl,
 fail:
         dict_len = dict_serialized_length (reply);
         if (dict_len < 0) {
-                gf_log (xl->name, GF_LOG_DEBUG,
+                gf_log ("server", GF_LOG_DEBUG,
                         "failed to get serialized length of reply dict");
                 op_ret   = -1;
                 op_errno = EINVAL;
@@ -5670,7 +5670,7 @@ fail:
         if (dict_len) {
                 ret = dict_serialize (reply, rsp->buf);
                 if (ret < 0) {
-                        gf_log (xl->name, GF_LOG_DEBUG,
+                        gf_log ("server", GF_LOG_DEBUG,
                                 "failed to serialize reply dict");
                         op_ret = -1;
                         op_errno = -ret;
@@ -6524,15 +6524,19 @@ int
 notify (xlator_t *this, int32_t event, void *data, ...)
 {
         int          ret = 0;
-        transport_t *trans = data;
+        transport_t *trans = NULL;
         peer_info_t *peerinfo = NULL;
         peer_info_t *myinfo = NULL;
 
-        if (trans != NULL) {
-                peerinfo = &(trans->peerinfo);
-                myinfo = &(trans->myinfo);
+        trans = data;
+        if (!trans) {
+                gf_log (this->name, GF_LOG_ERROR, "!trans");
+                goto out;
         }
 
+        peerinfo = &(trans->peerinfo);
+        myinfo = &(trans->myinfo);
+
         switch (event) {
         case GF_EVENT_POLLIN:
                 ret = protocol_server_pollin (this, trans);
@@ -6576,7 +6580,7 @@ notify (xlator_t *this, int32_t event, void *data, ...)
                 default_notify (this, event, data);
                 break;
         }
-
+out:
         return ret;
 }
 
diff --git a/xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.c b/xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.c
index 6714d32e7d8..85228bf4e58 100644
--- a/xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.c
+++ b/xlators/protocol/legacy/transport/ib-verbs/src/ib-verbs.c
@@ -1718,8 +1718,8 @@ ib_verbs_init (transport_t *this)
 
                 if (!priv->device) {
                         gf_log ("transport/ib-verbs", GF_LOG_ERROR,
-                                "could not create ib_verbs device for %s", 
-                                priv->device->device_name);
+                                "could not create ib_verbs device for %s",
+                                options->device_name);
                         ret = -1;
 			goto cleanup;
                 }
diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c
index bc4d4afa253..94586d20c53 100644
--- a/xlators/protocol/server/src/server-handshake.c
+++ b/xlators/protocol/server/src/server-handshake.c
@@ -614,7 +614,7 @@ server_setvolume (rpcsvc_request_t *req)
 fail:
         rsp.dict.dict_len = dict_serialized_length (reply);
         if (rsp.dict.dict_len < 0) {
-                gf_log (this->name, GF_LOG_DEBUG,
+                gf_log ("server-handshake", GF_LOG_DEBUG,
                         "failed to get serialized length of reply dict");
                 op_ret   = -1;
                 op_errno = EINVAL;
@@ -627,7 +627,7 @@ fail:
                 if (rsp.dict.dict_val) {
                         ret = dict_serialize (reply, rsp.dict.dict_val);
                         if (ret < 0) {
-                                gf_log (this->name, GF_LOG_DEBUG,
+                                gf_log ("server-handshake", GF_LOG_DEBUG,
                                         "failed to serialize reply dict");
                                 op_ret = -1;
                                 op_errno = -ret;
diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c
index 11c489e8867..216204a8ba0 100644
--- a/xlators/protocol/server/src/server-helpers.c
+++ b/xlators/protocol/server/src/server-helpers.c
@@ -541,15 +541,17 @@ server_connection_destroy (xlator_t *this, server_connection_t *conn)
                 INIT_LIST_HEAD (&file_lockers);
                 INIT_LIST_HEAD (&dir_lockers);
 
-                LOCK (&ltable->lock);
-                {
-                        list_splice_init (&ltable->file_lockers,
-                                          &file_lockers);
+                if (ltable) {
+                        LOCK (&ltable->lock);
+                        {
+                                list_splice_init (&ltable->file_lockers,
+                                                  &file_lockers);
 
-                        list_splice_init (&ltable->dir_lockers, &dir_lockers);
+                                list_splice_init (&ltable->dir_lockers, &dir_lockers);
+                        }
+                        UNLOCK (&ltable->lock);
+                        GF_FREE (ltable);
                 }
-                UNLOCK (&ltable->lock);
-                GF_FREE (ltable);
 
                 flock.l_type  = F_UNLCK;
                 flock.l_start = 0;
@@ -1030,7 +1032,7 @@ server_print_params (char *str, int size, server_state_t *state)
                                     "wbflags=%d,", state->wbflags);
         if (state->size)
                 filled += snprintf (str + filled, size - filled,
-                                    "size=%Zu,", state->size);
+                                    "size=%zu,", state->size);
         if (state->offset)
                 filled += snprintf (str + filled, size - filled,
                                     "offset=%"PRId64",", state->offset);
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index 104274edd02..a7501babbcc 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -593,10 +593,9 @@ init (xlator_t *this)
 
         ret = 0;
 out:
-        if (ret)
+        if (ret && this)
                 this->fini (this);
 
-
         return ret;
 }
 
diff --git a/xlators/protocol/server/src/server3_1-fops.c b/xlators/protocol/server/src/server3_1-fops.c
index 686c0350d0b..c04861ddf10 100644
--- a/xlators/protocol/server/src/server3_1-fops.c
+++ b/xlators/protocol/server/src/server3_1-fops.c
@@ -4737,7 +4737,7 @@ server_lookup (rpcsvc_request_t *req)
                 if (buf == NULL) {
                         gf_log (conn->bound_xl->name, GF_LOG_ERROR,
                                 "out of memory");
-                        goto err;
+                        goto out;
                 }
 
                 ret = dict_unserialize (buf, args.dict.dict_len,
@@ -4748,7 +4748,7 @@ server_lookup (rpcsvc_request_t *req)
                                 "unserialize req-buffer to dictionary",
                                 frame->root->unique, state->resolve.path,
                                 state->resolve.ino);
-                        goto err;
+                        goto out;
                 }
 
                 state->dict = xattr_req;
@@ -4761,7 +4761,7 @@ server_lookup (rpcsvc_request_t *req)
         resolve_and_resume (frame, server_lookup_resume);
 
         return 0;
-err:
+out:
         if (xattr_req)
                 dict_unref (xattr_req);
 
@@ -4771,7 +4771,7 @@ err:
 
         server_lookup_cbk (frame, NULL, frame->this, -1, EINVAL, NULL, NULL,
                            NULL, NULL);
-
+err:
         return 0;
 }