Skip to content

Commit 1b8d030

Browse files
lixiaokengmartinkpetersen
authored andcommitted
scsi: libiscsi: Fix UAF in iscsi_conn_get_param()/iscsi_conn_teardown()
|- 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/[email protected] Reported-by: Lu Tixiong <[email protected]> Reviewed-by: Mike Christie <[email protected]> Reviewed-by: Lee Duncan <[email protected]> Signed-off-by: Lixiaokeng <[email protected]> Signed-off-by: Linfeilong <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 9020be1 commit 1b8d030

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/scsi/libiscsi.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3100,6 +3100,8 @@ void iscsi_conn_teardown(struct iscsi_cls_conn *cls_conn)
31003100
{
31013101
struct iscsi_conn *conn = cls_conn->dd_data;
31023102
struct iscsi_session *session = conn->session;
3103+
char *tmp_persistent_address = conn->persistent_address;
3104+
char *tmp_local_ipaddr = conn->local_ipaddr;
31033105

31043106
del_timer_sync(&conn->transport_timer);
31053107

@@ -3121,8 +3123,6 @@ void iscsi_conn_teardown(struct iscsi_cls_conn *cls_conn)
31213123
spin_lock_bh(&session->frwd_lock);
31223124
free_pages((unsigned long) conn->data,
31233125
get_order(ISCSI_DEF_MAX_RECV_SEG_LEN));
3124-
kfree(conn->persistent_address);
3125-
kfree(conn->local_ipaddr);
31263126
/* regular RX path uses back_lock */
31273127
spin_lock_bh(&session->back_lock);
31283128
kfifo_in(&session->cmdpool.queue, (void*)&conn->login_task,
@@ -3134,6 +3134,8 @@ void iscsi_conn_teardown(struct iscsi_cls_conn *cls_conn)
31343134
mutex_unlock(&session->eh_mutex);
31353135

31363136
iscsi_destroy_conn(cls_conn);
3137+
kfree(tmp_persistent_address);
3138+
kfree(tmp_local_ipaddr);
31373139
}
31383140
EXPORT_SYMBOL_GPL(iscsi_conn_teardown);
31393141

0 commit comments

Comments
 (0)