From: Dmitry Eremin <dmitry.ere...@intel.com>

Null pointer 'cp' that comes from line 2544 may be dereferenced
at line 2618.
found by Klocwork Insight tool

Signed-off-by: Dmitry Eremin <dmitry.ere...@intel.com>
Reviewed-on: http://review.whamcloud.com/9386
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4629
Reviewed-by: John L. Hammond <john.hamm...@intel.com>
Reviewed-by: Isaac Huang <he.hu...@intel.com>
Signed-off-by: Oleg Drokin <oleg.dro...@intel.com>
---
 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c 
b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
index 6173e74..9bf6c94 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -2609,13 +2609,17 @@ kiblnd_rejected (kib_conn_t *conn, int reason, void 
*priv, int priv_nob)
 
                        case IBLND_REJECT_MSG_QUEUE_SIZE:
                                CERROR("%s rejected: incompatible message queue 
depth %d, %d\n",
-                                      libcfs_nid2str(peer->ibp_nid), 
cp->ibcp_queue_depth,
+                                      libcfs_nid2str(peer->ibp_nid),
+                                      cp != NULL ? cp->ibcp_queue_depth :
+                                      IBLND_MSG_QUEUE_SIZE(rej->ibr_version),
                                       IBLND_MSG_QUEUE_SIZE(conn->ibc_version));
                                break;
 
                        case IBLND_REJECT_RDMA_FRAGS:
                                CERROR("%s rejected: incompatible # of RDMA 
fragments %d, %d\n",
-                                      libcfs_nid2str(peer->ibp_nid), 
cp->ibcp_max_frags,
+                                      libcfs_nid2str(peer->ibp_nid),
+                                      cp != NULL ? cp->ibcp_max_frags :
+                                      IBLND_RDMA_FRAGS(rej->ibr_version),
                                       IBLND_RDMA_FRAGS(conn->ibc_version));
                                break;
 
-- 
1.9.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to