2018-05-08 03:46:58

by Jia-Ju Bai

[permalink] [raw]
Subject: [PATCH] ata: ata_piix: Fix a possible data race in piix_pci_device_resume

The write operation to "host->flags" is protected by
the lock on line 1048, but the read operation to
this data on line 1046 is not protected by the lock.
Thus, there may exist a data race for "host->flags".

To fix this data race, the read operation to "host->flags"
should be also protected by the lock.

Signed-off-by: Jia-Ju Bai <[email protected]>
---
drivers/ata/ata_piix.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 7ecb1322a514..c99fdf473dee 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -1043,8 +1043,8 @@ static int piix_pci_device_resume(struct pci_dev *pdev)
unsigned long flags;
int rc;

+ spin_lock_irqsave(&host->lock, flags);
if (host->flags & PIIX_HOST_BROKEN_SUSPEND) {
- spin_lock_irqsave(&host->lock, flags);
host->flags &= ~PIIX_HOST_BROKEN_SUSPEND;
spin_unlock_irqrestore(&host->lock, flags);

@@ -1060,8 +1060,10 @@ static int piix_pci_device_resume(struct pci_dev *pdev)
dev_err(&pdev->dev,
"failed to enable device after resume (%d)\n",
rc);
- } else
+ } else {
+ spin_unlock_irqrestore(&host->lock, flags);
rc = ata_pci_device_do_resume(pdev);
+ }

if (rc == 0)
ata_host_resume(host);
--
2.17.0



2018-05-08 14:21:14

by Tejun Heo

[permalink] [raw]
Subject: Re: [PATCH] ata: ata_piix: Fix a possible data race in piix_pci_device_resume

Hello,

On Tue, May 08, 2018 at 11:46:13AM +0800, Jia-Ju Bai wrote:
> The write operation to "host->flags" is protected by
> the lock on line 1048, but the read operation to
> this data on line 1046 is not protected by the lock.
> Thus, there may exist a data race for "host->flags".
>
> To fix this data race, the read operation to "host->flags"
> should be also protected by the lock.

This isn't necessarily wrong. It isn't different from atomic bitops -
the modifications are synchronized but what the reads get is
determined by memory ordering or other synchronization. Here, the
whole suspend / resume paths are always synchronized and the spinlocks
are there just in case there are other writers to the field.

Thanks.

--
tejun