Skip to content

Commit d35f664

Browse files
committed
Merge: PCI: switchtec: Fix stdev_release() crash after surprise hot remove
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/3881 ``` JIRA: https://issues.redhat.com/browse/RHEL-29481 CVE: CVE-2023-52617 Signed-off-by: Myron Stowe <mstowe@redhat.com> ``` Approved-by: Charles Mirabile <cmirabil@redhat.com> Approved-by: John W. Linville <linville@redhat.com> Approved-by: Andrew Halaney <ahalaney@redhat.com> Approved-by: David Arcari <darcari@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Approved-by: Lenny Szubowicz <lszubowi@redhat.com> Approved-by: Prarit Bhargava <prarit@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
2 parents 270ff77 + 8787804 commit d35f664

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

drivers/pci/switch/switchtec.c

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1308,13 +1308,6 @@ static void stdev_release(struct device *dev)
13081308
{
13091309
struct switchtec_dev *stdev = to_stdev(dev);
13101310

1311-
if (stdev->dma_mrpc) {
1312-
iowrite32(0, &stdev->mmio_mrpc->dma_en);
1313-
flush_wc_buf(stdev);
1314-
writeq(0, &stdev->mmio_mrpc->dma_addr);
1315-
dma_free_coherent(&stdev->pdev->dev, sizeof(*stdev->dma_mrpc),
1316-
stdev->dma_mrpc, stdev->dma_mrpc_dma_addr);
1317-
}
13181311
kfree(stdev);
13191312
}
13201313

@@ -1358,7 +1351,7 @@ static struct switchtec_dev *stdev_create(struct pci_dev *pdev)
13581351
return ERR_PTR(-ENOMEM);
13591352

13601353
stdev->alive = true;
1361-
stdev->pdev = pdev;
1354+
stdev->pdev = pci_dev_get(pdev);
13621355
INIT_LIST_HEAD(&stdev->mrpc_queue);
13631356
mutex_init(&stdev->mrpc_mutex);
13641357
stdev->mrpc_busy = 0;
@@ -1391,6 +1384,7 @@ static struct switchtec_dev *stdev_create(struct pci_dev *pdev)
13911384
return stdev;
13921385

13931386
err_put:
1387+
pci_dev_put(stdev->pdev);
13941388
put_device(&stdev->dev);
13951389
return ERR_PTR(rc);
13961390
}
@@ -1644,6 +1638,18 @@ static int switchtec_init_pci(struct switchtec_dev *stdev,
16441638
return 0;
16451639
}
16461640

1641+
static void switchtec_exit_pci(struct switchtec_dev *stdev)
1642+
{
1643+
if (stdev->dma_mrpc) {
1644+
iowrite32(0, &stdev->mmio_mrpc->dma_en);
1645+
flush_wc_buf(stdev);
1646+
writeq(0, &stdev->mmio_mrpc->dma_addr);
1647+
dma_free_coherent(&stdev->pdev->dev, sizeof(*stdev->dma_mrpc),
1648+
stdev->dma_mrpc, stdev->dma_mrpc_dma_addr);
1649+
stdev->dma_mrpc = NULL;
1650+
}
1651+
}
1652+
16471653
static int switchtec_pci_probe(struct pci_dev *pdev,
16481654
const struct pci_device_id *id)
16491655
{
@@ -1705,6 +1711,9 @@ static void switchtec_pci_remove(struct pci_dev *pdev)
17051711
ida_free(&switchtec_minor_ida, MINOR(stdev->dev.devt));
17061712
dev_info(&stdev->dev, "unregistered.\n");
17071713
stdev_kill(stdev);
1714+
switchtec_exit_pci(stdev);
1715+
pci_dev_put(stdev->pdev);
1716+
stdev->pdev = NULL;
17081717
put_device(&stdev->dev);
17091718
}
17101719

0 commit comments

Comments
 (0)