ufs: core: fix racing issue between ufshcd_mcq_abort and ISR
Subsystems (4)
PATCH v2 1/1 ufs: core: fix racing issue between ufshcd_mcq_abort and ISR
From: Peter Wang <[email protected]>
If command timeout happen and cq complete irq raise at the same time, ufshcd_mcq_abort null the lprb->cmd and NULL poiner KE in ISR. Below is error log.
ufshcd_abort: Device abort task at tag 18
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000108 pc : [0xffffffe27ef867ac] scsi_dma_unmap+0xc/0x44 lr : [0xffffffe27f1b898c] ufshcd_release_scsi_cmd+0x24/0x114
--- drivers/ufs/core/ufs-mcq.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/ufs/core/ufs-mcq.c +3 -0
@@ -630,6 +630,7 @@ int ufshcd_mcq_abort(struct scsi_cmnd *cmd)int tag =scsi_cmd_to_rq (cmd)->tag;struct ufshcd_lrb *lrbp = &hba->lrb[tag];struct ufs_hw_queue *hwq; +unsigned long flags;int err =FAILED ;if (!ufshcd_cmd_inflight (lrbp->cmd)) {
@@ -670,8 +671,10 @@ int ufshcd_mcq_abort(struct scsi_cmnd *cmd) } err =SUCCESS ; +spin_lock_irqsave (&hwq->cq_lock, flags);if (ufshcd_cmd_inflight (lrbp->cmd))ufshcd_release_scsi_cmd (hba, lrbp); +spin_unlock_irqrestore (&hwq->cq_lock, flags); out:return err;
Signature · 1 line
2.18.0
Quoted 3 lines · On 11/5/23 23:51, [email protected] wrote:
If command timeout happen and cq complete irq raise at the same time,
ufshcd_mcq_abortnull thelprb->cmdand NULL poiner KE in ISR. Below is error log.
Martin K. Petersen
AppliedQuoted 4 lines
If command timeout happen and cq complete irq raise at the same time,
ufshcd_mcq_abortnull thelprb->cmdand NULL poiner KE in ISR. Below is error log.
Applied to 6.7/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 11 lines · On Mon, 06 Nov 2023 15:51:17 +0800, [email protected] wrote:
If command timeout happen and cq complete irq raise at the same time,
ufshcd_mcq_abortnull thelprb->cmdand NULL poiner KE in ISR. Below is error log.
ufshcd_abort: Device abort task at tag 18Unable to handle kernel NULL pointer dereference at virtual address 0000000000000108 pc : [0xffffffe27ef867ac] scsi_dma_unmap+0xc/0x44 lr : [0xffffffe27f1b898c] ufshcd_release_scsi_cmd+0x24/0x114[...]
Applied to 6.7/scsi-fixes, thanks!
[1/1] ufs: core: fix racing issue between ufshcd_mcq_abort and ISR
https://git.kernel.org/mkp/scsi/c/27900d7119c4
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering