aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQinglang Miao <[email protected]>2020-11-20 15:48:52 +0800
committerMartin K. Petersen <[email protected]>2020-12-07 17:45:19 -0500
commit6dc1c7ab6f047f45b62986ffebc5324e86ed5f5a (patch)
tree8059fec400d26b3a3eb8b7c0209705922fc92d2b
parent97031ccffa4f62728602bfea8439dd045cd3aeb2 (diff)
scsi: iscsi: Fix inappropriate use of put_device()
kfree(conn) is called inside put_device(&conn->dev) which could lead to use-after-free. In addition, device_unregister() should be used here rather than put_deviceO(). Link: https://lore.kernel.org/r/[email protected] Fixes: f3c893e3dbb5 ("scsi: iscsi: Fail session and connection on transport registration failure") Reported-by: Hulk Robot <[email protected]> Reviewed-by: Mike Christie <[email protected]> Signed-off-by: Qinglang Miao <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
-rw-r--r--drivers/scsi/scsi_transport_iscsi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 2eb3e4f9375a..2e68c0a87698 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -2313,7 +2313,9 @@ iscsi_create_conn(struct iscsi_cls_session *session, int dd_size, uint32_t cid)
return conn;
release_conn_ref:
- put_device(&conn->dev);
+ device_unregister(&conn->dev);
+ put_device(&session->dev);
+ return NULL;
release_parent_ref:
put_device(&session->dev);
free_conn: