[SCSI] bnx2i: Added mutex lock protection to conn_get_param

Added net_dev mutex lock protection before accessing the csk
parameters.

Signed-off-by: Eddie Wai <eddie.wai@broadcom.com>
Reviewed-by: Benjamin Li <benli@broadcom.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c
index a2c9b1f2ea5cb052adb8a91195ba1971b977d58a..07dd4f9036f0e6ab8b9956b680aaba44532696b1 100644 (file)
--- a/drivers/scsi/bnx2i/bnx2i_iscsi.c
+++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c
@@ -1461,21 +1461,28 @@ 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);
        }
-
+out:
        return len;
 }