Skip to content

Commit a67aad5

Browse files
Xingui Yangmartinkpetersen
authored andcommitted
scsi: libsas: Grab the ATA port lock in sas_ata_device_link_abort()
Grab the ATA port lock in sas_ata_device_link_abort() before calling ata_link_abort() as outlined in this function's locking requirements. Fixes: 4411292 ("scsi: libsas: Add sas_ata_device_link_abort()") Signed-off-by: Xingui Yang <yangxingui@huawei.com> Reviewed-by: John Garry <john.g.garry@oracle.com> Reviewed-by: Jason Yan <yanaijie@huawei.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent ea44242 commit a67aad5

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/scsi/libsas/sas_ata.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -889,14 +889,17 @@ void sas_ata_device_link_abort(struct domain_device *device, bool force_reset)
889889
{
890890
struct ata_port *ap = device->sata_dev.ap;
891891
struct ata_link *link = &ap->link;
892+
unsigned long flags;
892893

894+
spin_lock_irqsave(ap->lock, flags);
893895
device->sata_dev.fis[2] = ATA_ERR | ATA_DRDY; /* tf status */
894896
device->sata_dev.fis[3] = ATA_ABORTED; /* tf error */
895897

896898
link->eh_info.err_mask |= AC_ERR_DEV;
897899
if (force_reset)
898900
link->eh_info.action |= ATA_EH_RESET;
899901
ata_link_abort(link);
902+
spin_unlock_irqrestore(ap->lock, flags);
900903
}
901904
EXPORT_SYMBOL_GPL(sas_ata_device_link_abort);
902905

0 commit comments

Comments
 (0)