[PATCH AUTOSEL 5.8 54/62] scsi: iscsi: Do not put host in iscsi_set_flashnode_param()

5 views
Skip to first unread message

Sasha Levin

unread,
Aug 21, 2020, 12:15:36 PM8/21/20
to linux-...@vger.kernel.org, sta...@vger.kernel.org, Jing Xiangfeng, Mike Christie, Martin K . Petersen, Sasha Levin, open-...@googlegroups.com, linux...@vger.kernel.org
From: Jing Xiangfeng <jingxi...@huawei.com>

[ Upstream commit 68e12e5f61354eb42cfffbc20a693153fc39738e ]

If scsi_host_lookup() fails we will jump to put_host which may cause a
panic. Jump to exit_set_fnode instead.

Link: https://lore.kernel.org/r/20200615081226.183...@huawei.com
Reviewed-by: Mike Christie <michael....@oracle.com>
Signed-off-by: Jing Xiangfeng <jingxi...@huawei.com>
Signed-off-by: Martin K. Petersen <martin....@oracle.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
drivers/scsi/scsi_transport_iscsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 7ae5024e78243..df07ecd94793a 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -3291,7 +3291,7 @@ static int iscsi_set_flashnode_param(struct iscsi_transport *transport,
pr_err("%s could not find host no %u\n",
__func__, ev->u.set_flashnode.host_no);
err = -ENODEV;
- goto put_host;
+ goto exit_set_fnode;
}

idx = ev->u.set_flashnode.flashnode_idx;
--
2.25.1

Sasha Levin

unread,
Aug 21, 2020, 12:16:56 PM8/21/20
to linux-...@vger.kernel.org, sta...@vger.kernel.org, Jing Xiangfeng, Mike Christie, Martin K . Petersen, Sasha Levin, open-...@googlegroups.com, linux...@vger.kernel.org
From: Jing Xiangfeng <jingxi...@huawei.com>

[ Upstream commit 68e12e5f61354eb42cfffbc20a693153fc39738e ]

If scsi_host_lookup() fails we will jump to put_host which may cause a
panic. Jump to exit_set_fnode instead.

Link: https://lore.kernel.org/r/20200615081226.183...@huawei.com
Reviewed-by: Mike Christie <michael....@oracle.com>
Signed-off-by: Jing Xiangfeng <jingxi...@huawei.com>
Signed-off-by: Martin K. Petersen <martin....@oracle.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
drivers/scsi/scsi_transport_iscsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index ea6d498fa9232..1d8359cc00e25 100644

Sasha Levin

unread,
Aug 21, 2020, 12:18:02 PM8/21/20
to linux-...@vger.kernel.org, sta...@vger.kernel.org, Jing Xiangfeng, Mike Christie, Martin K . Petersen, Sasha Levin, open-...@googlegroups.com, linux...@vger.kernel.org
From: Jing Xiangfeng <jingxi...@huawei.com>

[ Upstream commit 68e12e5f61354eb42cfffbc20a693153fc39738e ]

If scsi_host_lookup() fails we will jump to put_host which may cause a
panic. Jump to exit_set_fnode instead.

Link: https://lore.kernel.org/r/20200615081226.183...@huawei.com
Reviewed-by: Mike Christie <michael....@oracle.com>
Signed-off-by: Jing Xiangfeng <jingxi...@huawei.com>
Signed-off-by: Martin K. Petersen <martin....@oracle.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
drivers/scsi/scsi_transport_iscsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index a5c78b38d3022..dbad926e8f87f 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -3174,7 +3174,7 @@ static int iscsi_set_flashnode_param(struct iscsi_transport *transport,

Sasha Levin

unread,
Aug 21, 2020, 12:18:56 PM8/21/20
to linux-...@vger.kernel.org, sta...@vger.kernel.org, Jing Xiangfeng, Mike Christie, Martin K . Petersen, Sasha Levin, open-...@googlegroups.com, linux...@vger.kernel.org
From: Jing Xiangfeng <jingxi...@huawei.com>

[ Upstream commit 68e12e5f61354eb42cfffbc20a693153fc39738e ]

If scsi_host_lookup() fails we will jump to put_host which may cause a
panic. Jump to exit_set_fnode instead.

Link: https://lore.kernel.org/r/20200615081226.183...@huawei.com
Reviewed-by: Mike Christie <michael....@oracle.com>
Signed-off-by: Jing Xiangfeng <jingxi...@huawei.com>
Signed-off-by: Martin K. Petersen <martin....@oracle.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
drivers/scsi/scsi_transport_iscsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 04d095488c764..6983473011980 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -3172,7 +3172,7 @@ static int iscsi_set_flashnode_param(struct iscsi_transport *transport,

Sasha Levin

unread,
Aug 21, 2020, 12:19:40 PM8/21/20
to linux-...@vger.kernel.org, sta...@vger.kernel.org, Jing Xiangfeng, Mike Christie, Martin K . Petersen, Sasha Levin, open-...@googlegroups.com, linux...@vger.kernel.org
From: Jing Xiangfeng <jingxi...@huawei.com>

[ Upstream commit 68e12e5f61354eb42cfffbc20a693153fc39738e ]

If scsi_host_lookup() fails we will jump to put_host which may cause a
panic. Jump to exit_set_fnode instead.

Link: https://lore.kernel.org/r/20200615081226.183...@huawei.com
Reviewed-by: Mike Christie <michael....@oracle.com>
Signed-off-by: Jing Xiangfeng <jingxi...@huawei.com>
Signed-off-by: Martin K. Petersen <martin....@oracle.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
drivers/scsi/scsi_transport_iscsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 9589015234693..c3170500a1a1d 100644

Sasha Levin

unread,
Aug 21, 2020, 12:20:12 PM8/21/20
to linux-...@vger.kernel.org, sta...@vger.kernel.org, Jing Xiangfeng, Mike Christie, Martin K . Petersen, Sasha Levin, open-...@googlegroups.com, linux...@vger.kernel.org
From: Jing Xiangfeng <jingxi...@huawei.com>

[ Upstream commit 68e12e5f61354eb42cfffbc20a693153fc39738e ]

If scsi_host_lookup() fails we will jump to put_host which may cause a
panic. Jump to exit_set_fnode instead.

Link: https://lore.kernel.org/r/20200615081226.183...@huawei.com
Reviewed-by: Mike Christie <michael....@oracle.com>
Signed-off-by: Jing Xiangfeng <jingxi...@huawei.com>
Signed-off-by: Martin K. Petersen <martin....@oracle.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
drivers/scsi/scsi_transport_iscsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 42b97f1196232..c2bce3f6eaace 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -3191,7 +3191,7 @@ static int iscsi_set_flashnode_param(struct iscsi_transport *transport,

Sasha Levin

unread,
Aug 21, 2020, 12:20:41 PM8/21/20
to linux-...@vger.kernel.org, sta...@vger.kernel.org, Jing Xiangfeng, Mike Christie, Martin K . Petersen, Sasha Levin, open-...@googlegroups.com, linux...@vger.kernel.org
From: Jing Xiangfeng <jingxi...@huawei.com>

[ Upstream commit 68e12e5f61354eb42cfffbc20a693153fc39738e ]

If scsi_host_lookup() fails we will jump to put_host which may cause a
panic. Jump to exit_set_fnode instead.

Link: https://lore.kernel.org/r/20200615081226.183...@huawei.com
Reviewed-by: Mike Christie <michael....@oracle.com>
Signed-off-by: Jing Xiangfeng <jingxi...@huawei.com>
Signed-off-by: Martin K. Petersen <martin....@oracle.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
drivers/scsi/scsi_transport_iscsi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index de10b461ec7ef..4903640316480 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -3192,7 +3192,7 @@ static int iscsi_set_flashnode_param(struct iscsi_transport *transport,
Reply all
Reply to author
Forward
0 new messages