Commit 5c8d1cd0 authored by Wenchao Hao's avatar Wenchao Hao Committed by Zheng Zengkai
Browse files

scsi: libiscsi: Teardown iscsi_cls_conn gracefully 

mainline inclusion
from mainline-v5.18-rc1
commit 8709c323
category: bugfix
bugzilla: 187381, https://gitee.com/openeuler/kernel/issues/I5LBBP
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8709c323091be019f76a49cf783052a5636aca85

--------------------------------

Commit 1b8d0300 ("scsi: libiscsi: Fix UAF in
iscsi_conn_get_param()/iscsi_conn_teardown()") fixed an UAF in
iscsi_conn_get_param() and introduced 2 tmp_xxx varibles.

We can gracefully fix this UAF with the help of device_del(). Calling
iscsi_remove_conn() at the beginning of iscsi_conn_teardown would make
userspace unable to see iscsi_cls_conn. This way we we can free memory
safely.

Remove iscsi_destroy_conn() since it is no longer used.

Link: https://lore.kernel.org/r/20220310015759.3296841-4-haowenchao@huawei.com


Reviewed-by: default avatarMike Christie <michael.christie@oracle.com>
Signed-off-by: default avatarWenchao Hao <haowenchao@huawei.com>
Signed-off-by: default avatarWu Bo <wubo40@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>

Conflict: iscsi_destroy_conn() is not removed.
Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 6492c6bf

drivers/scsi/libiscsi.c

+5 −5
Original line number Diff line number Diff line
@@ -3104,8 +3104,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;



	iscsi_remove_conn(cls_conn);



	del_timer_sync(&conn->transport_timer);
@@ -3127,6 +3127,8 @@ 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,
@@ -3137,9 +3139,7 @@ void iscsi_conn_teardown(struct iscsi_cls_conn *cls_conn) 
	spin_unlock_bh(&session->frwd_lock);

	mutex_unlock(&session->eh_mutex);



	iscsi_destroy_conn(cls_conn);

	kfree(tmp_persistent_address);

	kfree(tmp_local_ipaddr);

	iscsi_put_conn(cls_conn);

}

EXPORT_SYMBOL_GPL(iscsi_conn_teardown);

drivers/scsi/scsi_transport_iscsi.c

+5 −1
Original line number Diff line number Diff line
@@ -2168,7 +2168,11 @@ static int iscsi_iter_destroy_conn_fn(struct device *dev, void *data) 
{

	if (!iscsi_is_conn_dev(dev))

		return 0;

	return iscsi_destroy_conn(iscsi_dev_to_conn(dev));



	iscsi_remove_conn(iscsi_dev_to_conn(dev));

	iscsi_put_conn(iscsi_dev_to_conn(dev));



	return 0;

}



void iscsi_remove_session(struct iscsi_cls_session *session)