Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89f5055f authored by Dmitry Bogdanov's avatar Dmitry Bogdanov Committed by Greg Kroah-Hartman
Browse files

scsi: target: iscsit: Free cmds before session free 



[ Upstream commit d8990b5a4d065f38f35d69bcd627ec5a7f8330ca ]

Commands from recovery entries are freed after session has been closed.
That leads to use-after-free at command free or NPE with such call trace:

Time2Retain timer expired for SID: 1, cleaning up iSCSI session.
BUG: kernel NULL pointer dereference, address: 0000000000000140
RIP: 0010:sbitmap_queue_clear+0x3a/0xa0
Call Trace:
 target_release_cmd_kref+0xd1/0x1f0 [target_core_mod]
 transport_generic_free_cmd+0xd1/0x180 [target_core_mod]
 iscsit_free_cmd+0x53/0xd0 [iscsi_target_mod]
 iscsit_free_connection_recovery_entries+0x29d/0x320 [iscsi_target_mod]
 iscsit_close_session+0x13a/0x140 [iscsi_target_mod]
 iscsit_check_post_dataout+0x440/0x440 [iscsi_target_mod]
 call_timer_fn+0x24/0x140

Move cleanup of recovery enrties to before session freeing.

Reported-by: default avatarForza <forza@tnonline.net>
Signed-off-by: default avatarDmitry Bogdanov <d.bogdanov@yadro.com>
Signed-off-by: default avatarMike Christie <michael.christie@oracle.com>
Link: https://lore.kernel.org/r/20230319015620.96006-7-michael.christie@oracle.com


Reviewed-by: default avatarMaurizio Lombardi <mlombard@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 67236cf1

drivers/target/iscsi/iscsi_target.c

+3 −3
Original line number Diff line number Diff line
@@ -4385,6 +4385,9 @@ int iscsit_close_session(struct iscsi_session *sess) 
	iscsit_stop_time2retain_timer(sess);

	spin_unlock_bh(&se_tpg->session_lock);



	if (sess->sess_ops->ErrorRecoveryLevel == 2)

		iscsit_free_connection_recovery_entries(sess);



	/*

	 * transport_deregister_session_configfs() will clear the

	 * struct se_node_acl->nacl_sess pointer now as a iscsi_np process context
@@ -4413,9 +4416,6 @@ int iscsit_close_session(struct iscsi_session *sess) 


	transport_deregister_session(sess->se_sess);



	if (sess->sess_ops->ErrorRecoveryLevel == 2)

		iscsit_free_connection_recovery_entries(sess);



	iscsit_free_all_ooo_cmdsns(sess);



	spin_lock_bh(&se_tpg->session_lock);