1 files changed, 20 insertions, 0 deletions

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index e88b726ab2e0..c1af2aa8e4e0 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -1990,6 +1990,8 @@ void iscsi_session_teardown(struct iscsi_cls_session *cls_session)
         kfree(session->username);
         kfree(session->username_in);
         kfree(session->targetname);
+        kfree(session->initiatorname);
+        kfree(session->ifacename);
 
         iscsi_destroy_session(cls_session);
         module_put(owner);
@@ -2453,6 +2455,14 @@ int iscsi_set_param(struct iscsi_cls_conn *cls_conn,
                 if (!conn->persistent_address)
                         return -ENOMEM;
                 break;
+        case ISCSI_PARAM_IFACE_NAME:
+                if (!session->ifacename)
+                        session->ifacename = kstrdup(buf, GFP_KERNEL);
+                break;
+        case ISCSI_PARAM_INITIATOR_NAME:
+                if (!session->initiatorname)
+                        session->initiatorname = kstrdup(buf, GFP_KERNEL);
+                break;
         default:
                 return -ENOSYS;
         }
@@ -2519,6 +2529,15 @@ int iscsi_session_get_param(struct iscsi_cls_session *cls_session,
         case ISCSI_PARAM_PASSWORD_IN:
                 len = sprintf(buf, "%s\n", session->password_in);
                 break;
+        case ISCSI_PARAM_IFACE_NAME:
+                len = sprintf(buf, "%s\n", session->ifacename);
+                break;
+        case ISCSI_PARAM_INITIATOR_NAME:
+                if (!session->initiatorname)
+                        len = sprintf(buf, "%s\n", "unknown");
+                else
+                        len = sprintf(buf, "%s\n", session->initiatorname);
+                break;
         default:
                 return -ENOSYS;
         }
@@ -2606,6 +2625,7 @@ int iscsi_host_get_param(struct Scsi_Host *shost, enum iscsi_host_param param,
                 else
                         len = sprintf(buf, "%s\n",
                                       ihost->local_address);
+                break;
         default:
                 return -ENOSYS;
         }