Sasha Levin
necitită,3 ian. 2022, 12:29:2103.01.2022Conectați-vă pentru a-i răspunde autorului
Conectați-vă pentru a redirecționa
Nu aveți permisiunea de a șterge mesaje din acest grup
Adresele de e-mail sunt anonime pentru acest grup sau este necesară permisiunea de a vedea adresele de e-mail ale membrilor pentru a afișa mesajul inițial
– linux-...@vger.kernel.org, sta...@vger.kernel.org, Lixiaokeng, Lu Tixiong, Mike Christie, Lee Duncan, Linfeilong, Martin K . Petersen, Sasha Levin, cle...@redhat.com, je...@linux.ibm.com, open-...@googlegroups.com, linux...@vger.kernel.org
From: Lixiaokeng <
lixia...@huawei.com>
[ Upstream commit 1b8d0300a3e9f216ae4901bab886db7299899ec6 ]
|- iscsi_if_destroy_conn |-dev_attr_show
|-iscsi_conn_teardown
|-spin_lock_bh |-iscsi_sw_tcp_conn_get_param
|-kfree(conn->persistent_address) |-iscsi_conn_get_param
|-kfree(conn->local_ipaddr)
==>|-read persistent_address
==>|-read local_ipaddr
|-spin_unlock_bh
When iscsi_conn_teardown() and iscsi_conn_get_param() happen in parallel, a
UAF may be triggered.
Link:
https://lore.kernel.org/r/046ec8a0-ce95-d3fc...@huawei.com
Reported-by: Lu Tixiong <
lutia...@huawei.com>
Reviewed-by: Mike Christie <
michael....@oracle.com>
Reviewed-by: Lee Duncan <
ldu...@suse.com>
Signed-off-by: Lixiaokeng <
lixia...@huawei.com>
Signed-off-by: Linfeilong <
linfe...@huawei.com>
Signed-off-by: Martin K. Petersen <
martin....@oracle.com>
Signed-off-by: Sasha Levin <
sas...@kernel.org>
---
drivers/scsi/libiscsi.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 5bc91d34df634..cbc263ec9d661 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -3101,6 +3101,8 @@ void iscsi_conn_teardown(struct iscsi_cls_conn *cls_conn)
{
struct iscsi_conn *conn = cls_conn->dd_data;
struct iscsi_session *session = conn->session;
+ char *tmp_persistent_address = conn->persistent_address;
+ char *tmp_local_ipaddr = conn->local_ipaddr;
del_timer_sync(&conn->transport_timer);
@@ -3122,8 +3124,6 @@ void iscsi_conn_teardown(struct iscsi_cls_conn *cls_conn)
spin_lock_bh(&session->frwd_lock);
free_pages((unsigned long) conn->data,
get_order(ISCSI_DEF_MAX_RECV_SEG_LEN));
- kfree(conn->persistent_address);
- kfree(conn->local_ipaddr);
/* regular RX path uses back_lock */
spin_lock_bh(&session->back_lock);
kfifo_in(&session->cmdpool.queue, (void*)&conn->login_task,
@@ -3135,6 +3135,8 @@ void iscsi_conn_teardown(struct iscsi_cls_conn *cls_conn)
mutex_unlock(&session->eh_mutex);
iscsi_destroy_conn(cls_conn);
+ kfree(tmp_persistent_address);
+ kfree(tmp_local_ipaddr);
}
EXPORT_SYMBOL_GPL(iscsi_conn_teardown);
--
2.34.1