From: Mike Christie <michaelc@cs.wisc.edu>
Date: Fri, 2 Dec 2011 03:38:43 +0000 (-0600)
Subject: [SCSI] qla4xxx: check for failed conn setup
X-Git-Tag: Ubuntu-5.2.0-15.16~18964^2~68
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ff1d0319ac6a5fd859884b30c0a3cb6733b8fb2d;p=mirror_ubuntu-eoan-kernel.git

[SCSI] qla4xxx: check for failed conn setup

iscsi_conn_setup can fail so we must check for NULL being
returned.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
---

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 95910c9b4776..4169c8baa112 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1207,6 +1207,9 @@ qla4xxx_conn_create(struct iscsi_cls_session *cls_sess, uint32_t conn_idx)
 	DEBUG2(printk(KERN_INFO "Func: %s\n", __func__));
 	cls_conn = iscsi_conn_setup(cls_sess, sizeof(struct qla_conn),
 				    conn_idx);
+	if (!cls_conn)
+		return NULL;
+
 	sess = cls_sess->dd_data;
 	ddb_entry = sess->dd_data;
 	ddb_entry->conn = cls_conn;