diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-01 09:13:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-01 09:13:04 -0800 |
| commit | a215ce8f0e00c2d707080236f1aafec337371043 (patch) | |
| tree | 06dac3b495bef0ea680cdb411e18e44a9f51cd9d /drivers/iommu | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | iommu/dmar: Fix buffer overflow during PCI bus notification (diff) | |
| download | linux-dev-a215ce8f0e00c2d707080236f1aafec337371043.tar.xz linux-dev-a215ce8f0e00c2d707080236f1aafec337371043.zip | |
Merge tag 'iommu-fix-v5.0-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU fix from Joerg Roedel:
"One important fix for a memory corruption issue in the Intel VT-d
driver that triggers on hardware with deep PCI hierarchies"
* tag 'iommu-fix-v5.0-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/dmar: Fix buffer overflow during PCI bus notification
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/dmar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index dc9f14811e0f..58dc70bffd5b 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -144,7 +144,7 @@ dmar_alloc_pci_notify_info(struct pci_dev *dev, unsigned long event) for (tmp = dev; tmp; tmp = tmp->bus->self) level++; - size = sizeof(*info) + level * sizeof(struct acpi_dmar_pci_path); + size = sizeof(*info) + level * sizeof(info->path[0]); if (size <= sizeof(dmar_pci_notify_info_buf)) { info = (struct dmar_pci_notify_info *)dmar_pci_notify_info_buf; } else { |