Whamcloud - gitweb
LU-9076 ptlrpc: Prevent possible dereference of NULL pointers 09/25909/2
authorSteve Guminski <stephenx.guminski@intel.com>
Wed, 1 Mar 2017 18:46:19 +0000 (13:46 -0500)
committerOleg Drokin <oleg.drokin@intel.com>
Wed, 19 Apr 2017 04:47:19 +0000 (04:47 +0000)
Check pointers for NULL before passing to other functions.

Signed-off-by: Steve Guminski <stephenx.guminski@intel.com>
Change-Id: I5ad1e6675e9c5e41aee2dc59045ed67e9da5ea0d
Reviewed-on: https://review.whamcloud.com/25909
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/ptlrpc/client.c

index 8660a82..13a3ece 100644 (file)
@@ -2034,13 +2034,15 @@ int ptlrpc_check_set(const struct lu_env *env, struct ptlrpc_request_set *set)
                }
                ptlrpc_rqphase_move(req, RQ_PHASE_COMPLETE);
 
-               CDEBUG(req->rq_reqmsg != NULL ? D_RPCTRACE : 0,
-                       "Completed RPC pname:cluuid:pid:xid:nid:"
-                       "opc %s:%s:%d:%llu:%s:%d\n",
-                       current_comm(), imp->imp_obd->obd_uuid.uuid,
-                       lustre_msg_get_status(req->rq_reqmsg), req->rq_xid,
-                       libcfs_nid2str(imp->imp_connection->c_peer.nid),
-                       lustre_msg_get_opc(req->rq_reqmsg));
+               if (req->rq_reqmsg != NULL)
+                       CDEBUG(D_RPCTRACE,
+                              "Completed RPC pname:cluuid:pid:xid:nid:"
+                              "opc %s:%s:%d:%llu:%s:%d\n", current_comm(),
+                              imp->imp_obd->obd_uuid.uuid,
+                              lustre_msg_get_status(req->rq_reqmsg),
+                              req->rq_xid,
+                              libcfs_nid2str(imp->imp_connection->c_peer.nid),
+                              lustre_msg_get_opc(req->rq_reqmsg));
 
                spin_lock(&imp->imp_lock);
                /* Request already may be not on sending or delaying list. This