scsi: qla2xxx: Fix CVE-2022-49158 and CVE-2022-50493
Subsystems (2)
cover scsi: qla2xxx: Fix CVE-2022-49158 and CVE-2022-50493
Backport two qla2xxx CVE fixes to 5.10.y. Sent as a series since both patches touch drivers/scsi/qla2xxx/qla_init.c with overlapping context.
Arun Easi (1):
scsi: qla2xxx: Fix crash when I/O abort times out
Quinn Tran (1):
scsi: qla2xxx: Fix warning message due to adisc being flushed
drivers/scsi/qla2xxx/qla_init.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
Signature · 1 line
2.50.1
PATCH 1/2 scsi: qla2xxx: Fix warning message due to adisc being flushed
From: Quinn Tran <[email protected]>
commit 64f24af75b79cba3b86b0760e27e0fa904db570f upstream.
Fix warning message due to adisc being flushed. Linux kernel triggered a warning message where a different error code type is not matching up with the expected type. Add additional translation of one error code type to another.
WARNING: CPU: 2 PID: 1131623 at drivers/scsi/qla2xxx/qla_init.c:498 qla2x00_async_adisc_sp_done+0x294/0x2b0 [qla2xxx] CPU: 2 PID: 1131623 Comm: drmgr Not tainted 5.13.0-rc1-autotest #1
..
GPR28: c000000aaa9c8890 c0080000079ab678 c00000140a104800 c00000002bd19000 NIP [c00800000790857c] qla2x00_async_adisc_sp_done+0x294/0x2b0 [qla2xxx] LR [c008000007908578] qla2x00_async_adisc_sp_done+0x290/0x2b0 [qla2xxx]
Call Trace: [c00000001cdc3620] [c008000007908578] qla2x00_async_adisc_sp_done+0x290/0x2b0 [qla2xxx] (unreliable) [c00000001cdc3710] [c0080000078f3080] __qla2x00_abort_all_cmds+0x1b8/0x580 [qla2xxx] [c00000001cdc3840] [c0080000078f589c] qla2x00_abort_all_cmds+0x34/0xd0 [qla2xxx] [c00000001cdc3880] [c0080000079153d8] qla2x00_abort_isp_cleanup+0x3f0/0x570 [qla2xxx] [c00000001cdc3920] [c0080000078fb7e8] qla2x00_remove_one+0x3d0/0x480 [qla2xxx] [c00000001cdc39b0] [c00000000071c274] pci_device_remove+0x64/0x120 [c00000001cdc39f0] [c0000000007fb818] device_release_driver_internal+0x168/0x2a0 [c00000001cdc3a30] [c00000000070e304] pci_stop_bus_device+0xb4/0x100 [c00000001cdc3a70] [c00000000070e4f0] pci_stop_and_remove_bus_device+0x20/0x40 [c00000001cdc3aa0] [c000000000073940] pci_hp_remove_devices+0x90/0x130 [c00000001cdc3b30] [c0080000070704d0] disable_slot+0x38/0x90 [rpaphp] [ c00000001cdc3b60] [c00000000073eb4c] power_write_file+0xcc/0x180 [c00000001cdc3be0] [c0000000007354bc] pci_slot_attr_store+0x3c/0x60 [c00000001cdc3c00] [c00000000055f820] sysfs_kf_write+0x60/0x80 [c00000001cdc3c20] [c00000000055df10] kernfs_fop_write_iter+0x1a0/0x290 [c00000001cdc3c70] [c000000000447c4c] new_sync_write+0x14c/0x1d0 [c00000001cdc3d10] [c00000000044b134] vfs_write+0x224/0x330 [c00000001cdc3d60] [c00000000044b3f4] ksys_write+0x74/0x130 [c00000001cdc3db0] [c00000000002df70] system_call_exception+0x150/0x2d0 [c00000001cdc3e10] [c00000000000d45c] system_call_common+0xec/0x278
[ kovalev: bp to fix CVE-2022-49158; in qla2x00_async_prli_sp_done used
'if (res)' instead of 'else if (res)' due to the older kernel not having the preceding QLA_OS_TIMER_EXPIRED check (see upstream commit 4de067e5df12) ]
--- drivers/scsi/qla2xxx/qla_init.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/scsi/qla2xxx/qla_init.c +6 -0
@@ -283,6 +283,8 @@ static void qla2x00_async_login_sp_done(srb_t *sp, int res) ea.iop[0 ] = lio->u.logio.iop[0 ]; ea.iop[1 ] = lio->u.logio.iop[1 ]; ea.sp = sp; +if (res) + ea.data[0 ] =MBS_COMMAND_ERROR ;qla24xx_handle_plogi_done_event (vha, &ea); }
@@ -563,6 +565,8 @@ static void qla2x00_async_adisc_sp_done(srb_t *sp, int res) ea.iop[1 ] = lio->u.logio.iop[1 ]; ea.fcport = sp->fcport; ea.sp = sp; +if (res) + ea.data[0 ] =MBS_COMMAND_ERROR ;qla24xx_handle_adisc_event (vha, &ea);
@@ -1238,6 +1242,8 @@ static void qla2x00_async_prli_sp_done(srb_t *sp, int res) ea.iop[0 ] = lio->u.logio.iop[0 ]; ea.iop[1 ] = lio->u.logio.iop[1 ]; ea.sp = sp; +if (res) + ea.data[0 ] =MBS_COMMAND_ERROR ;qla24xx_handle_prli_done_event (vha, &ea); }
Signature · 1 line
2.50.1
PATCH 2/2 scsi: qla2xxx: Fix crash when I/O abort times out
In reply to Vasiliy KovalevFrom: Arun Easi <[email protected]>
commit 68ad83188d782b2ecef2e41ac245d27e0710fe8e upstream.
While performing CPU hotplug, a crash with the following stack was seen:
Call Trace:
qla24xx_process_response_queue+0x42a/0x970 [qla2xxx]
qla2x00_start_nvme_mq+0x3a2/0x4b0 [qla2xxx]
qla_nvme_post_cmd+0x166/0x240 [qla2xxx]
nvme_fc_start_fcp_op.part.0+0x119/0x2e0 [nvme_fc]
blk_mq_dispatch_rq_list+0x17b/0x610
__blk_mq_sched_dispatch_requests+0xb0/0x140
blk_mq_sched_dispatch_requests+0x30/0x60
__blk_mq_run_hw_queue+0x35/0x90
__blk_mq_delay_run_hw_queue+0x161/0x180
blk_execute_rq+0xbe/0x160
__nvme_submit_sync_cmd+0x16f/0x220 [nvme_core]
nvmf_connect_admin_queue+0x11a/0x170 [nvme_fabrics]
nvme_fc_create_association.cold+0x50/0x3dc [nvme_fc]
nvme_fc_connect_ctrl_work+0x19/0x30 [nvme_fc]
process_one_work+0x1e8/0x3c0On abort timeout, completion was called without checking if the I/O was already completed.
Verify that I/O and abort request are indeed outstanding before attempting completion.
--- drivers/scsi/qla2xxx/qla_init.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +10 -4
@@ -101,6 +101,7 @@ static void qla24xx_abort_iocb_timeout(void *data)struct qla_qpair *qpair = sp->qpair;u32 handle;unsigned long flags; +int sp_found =0 , cmdsp_found =0 ;if (sp->cmd_sp) ql_dbg(ql_dbg_async, sp->vha, 0x507c,
@@ -115,22 +116,27 @@ static void qla24xx_abort_iocb_timeout(void *data)spin_lock_irqsave (qpair->qp_lock_ptr, flags);for (handle =1 ; handle < qpair->req->num_outstanding_cmds; handle++) {if (sp->cmd_sp && (qpair->req->outstanding_cmds[handle] == - sp->cmd_sp)) + sp->cmd_sp)) { qpair->req->outstanding_cmds[handle] =NULL ; + cmdsp_found =1 ; + }/* removing the abort */ if (qpair->req->outstanding_cmds[handle] == sp) { qpair->req->outstanding_cmds[handle] =NULL ; + sp_found =1 ;break ; } }spin_unlock_irqrestore (qpair->qp_lock_ptr, flags); -if (sp->cmd_sp) +if (cmdsp_found && sp->cmd_sp) sp->cmd_sp->done (sp->cmd_sp,QLA_OS_TIMER_EXPIRED ); - abt->u.abt.comp_status =cpu_to_le16 (CS_TIMEOUT ); - sp->done (sp,QLA_OS_TIMER_EXPIRED ); +if (sp_found) { + abt->u.abt.comp_status =cpu_to_le16 (CS_TIMEOUT ); + sp->done (sp,QLA_OS_TIMER_EXPIRED ); + } }static void qla24xx_abort_sp_done (srb_t *sp,int res)
Signature · 1 line
2.50.1