[v2] scsi: libsas: Fix did not grab the ata port lock in sas_ata_device_link_abort()

Message ID 20221221015203.46367-1-yangxingui@huawei.com
State New
Headers
Series [v2] scsi: libsas: Fix did not grab the ata port lock in sas_ata_device_link_abort() |

Commit Message

yangxingui Dec. 21, 2022, 1:52 a.m. UTC
  Grab the ata port lock in sas_ata_device_link_abort() before calling
ata_link_abort(), as the comment in ata_link_abort() mentions.

Fixes: 44112922674b ("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>
---
Changes to v1:
- Add a fixes tag
- Update commit message
---
 drivers/scsi/libsas/sas_ata.c | 3 +++
 1 file changed, 3 insertions(+)
  

Comments

Jason Yan Dec. 21, 2022, 2:50 a.m. UTC | #1
On 2022/12/21 9:52, Xingui Yang wrote:
> Grab the ata port lock in sas_ata_device_link_abort() before calling
> ata_link_abort(), as the comment in ata_link_abort() mentions.
> 
> Fixes: 44112922674b ("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>
> ---
> Changes to v1:
> - Add a fixes tag
> - Update commit message
> ---
>   drivers/scsi/libsas/sas_ata.c | 3 +++
>   1 file changed, 3 insertions(+)

Looks good,
Reviewed-by: Jason Yan <yanaijie@huawei.com>
  

Patch

diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index f7439bf9cdc6..4f2017b21e6d 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -889,7 +889,9 @@  void sas_ata_device_link_abort(struct domain_device *device, bool force_reset)
 {
 	struct ata_port *ap = device->sata_dev.ap;
 	struct ata_link *link = &ap->link;
+	unsigned long flags;
 
+	spin_lock_irqsave(ap->lock, flags);
 	device->sata_dev.fis[2] = ATA_ERR | ATA_DRDY; /* tf status */
 	device->sata_dev.fis[3] = ATA_ABORTED; /* tf error */
 
@@ -897,6 +899,7 @@  void sas_ata_device_link_abort(struct domain_device *device, bool force_reset)
 	if (force_reset)
 		link->eh_info.action |= ATA_EH_RESET;
 	ata_link_abort(link);
+	spin_unlock_irqrestore(ap->lock, flags);
 }
 EXPORT_SYMBOL_GPL(sas_ata_device_link_abort);