From: Steve Wise <swise@opengridcomputing.com>
Date: Fri, 10 Sep 2010 16:14:48 +0000 (-0500)
Subject: RDMA/cxgb4: Don't use null ep ptr
X-Git-Tag: v2.6.37-rc1~95^2^4~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af93fb5dcc6b1cba5fd0861d349b3f9c93144bc0;p=thirdparty%2Flinux.git

RDMA/cxgb4: Don't use null ep ptr

In c4iw_modify_qp() error path, only use qhp->ep if ep is not already set.
Otherwise qhp->ep can be NULL and we crash.

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
---

diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index 5d11f86015996..4f5dd66da39d0 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -1305,7 +1305,8 @@ err:
 
 	/* disassociate the LLP connection */
 	qhp->attr.llp_stream_handle = NULL;
-	ep = qhp->ep;
+	if (!ep)
+		ep = qhp->ep;
 	qhp->ep = NULL;
 	qhp->attr.state = C4IW_QP_STATE_ERROR;
 	free = 1;