Added net_dev mutex lock protection before accessing the csk
parameters.

Signed-off-by: Eddie Wai <eddie....@broadcom.com>
Reviewed-by: Benjamin Li <be...@broadcom.com>
---
 drivers/scsi/bnx2i/bnx2i_iscsi.c |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c
index 6a87a83..6951969 100644
--- a/drivers/scsi/bnx2i/bnx2i_iscsi.c
+++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c
@@ -1473,21 +1473,30 @@ static int bnx2i_conn_get_param(struct iscsi_cls_conn 
*cls_conn,
        struct bnx2i_conn *bnx2i_conn = conn->dd_data;
        int len = 0;
 
+       if (!(bnx2i_conn && bnx2i_conn->ep && bnx2i_conn->ep->hba))
+               goto out;
+
        switch (param) {
        case ISCSI_PARAM_CONN_PORT:
-               if (bnx2i_conn->ep)
+               mutex_lock(&bnx2i_conn->ep->hba->net_dev_lock);
+               if (bnx2i_conn->ep->cm_sk)
                        len = sprintf(buf, "%hu\n",
                                      bnx2i_conn->ep->cm_sk->dst_port);
+               mutex_unlock(&bnx2i_conn->ep->hba->net_dev_lock);
                break;
        case ISCSI_PARAM_CONN_ADDRESS:
-               if (bnx2i_conn->ep)
+               mutex_lock(&bnx2i_conn->ep->hba->net_dev_lock);
+               if (bnx2i_conn->ep->cm_sk)
                        len = sprintf(buf, "%pI4\n",
                                      &bnx2i_conn->ep->cm_sk->dst_ip);
+               mutex_unlock(&bnx2i_conn->ep->hba->net_dev_lock);
                break;
        default:
-               return iscsi_conn_get_param(cls_conn, param, buf);
+               len = iscsi_conn_get_param(cls_conn, param, buf);
+               if (len == -ENOSYS)
+                       len = 0;
        }
-
+out:
        return len;
 }
 
-- 
1.7.0.5


-- 
You received this message because you are subscribed to the Google Groups 
"open-iscsi" group.
To post to this group, send email to open-is...@googlegroups.com.
To unsubscribe from this group, send email to 
open-iscsi+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/open-iscsi?hl=en.

Reply via email to