summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-06-23 10:02:00 +0300
committerBen Hutchings <ben@decadent.org.uk>2017-10-12 15:27:53 +0100
commit415b8b3695357f8f672c30b01911ce578ad92913 (patch)
tree25f6d22d1d16fa537c39a8fd5dec108f75bf2b18
parentca78cc0370b35e487b8e7884e9032f4c0a0060c8 (diff)
downloadlinux-stable-415b8b3695357f8f672c30b01911ce578ad92913.tar.gz
linux-stable-415b8b3695357f8f672c30b01911ce578ad92913.tar.bz2
linux-stable-415b8b3695357f8f672c30b01911ce578ad92913.zip
scsi: bnx2i: missing error code in bnx2i_ep_connect()
commit 1d32a62c74b3bcb69822b0f4745af5410cfec3a7 upstream. If bnx2i_map_ep_dbell_regs() then we accidentally return NULL instead of an error pointer. It results in a NULL dereference in iscsi_if_ep_connect(). Fixes: cf4e6363859d ("[SCSI] bnx2i: Add bnx2i iSCSI driver.") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/scsi/bnx2i/bnx2i_iscsi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c
index 166543f7ef55..0bf408ac5b7a 100644
--- a/drivers/scsi/bnx2i/bnx2i_iscsi.c
+++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c
@@ -1906,7 +1906,8 @@ static struct iscsi_endpoint *bnx2i_ep_connect(struct Scsi_Host *shost,
bnx2i_ep_active_list_add(hba, bnx2i_ep);
- if (bnx2i_map_ep_dbell_regs(bnx2i_ep))
+ rc = bnx2i_map_ep_dbell_regs(bnx2i_ep);
+ if (rc)
goto del_active_ep;
mutex_unlock(&hba->net_dev_lock);