aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2015-07-24 19:27:57 -0400
committerJoerg Roedel <jroedel@suse.de>2015-08-03 10:15:47 -0400
commit2439d4aa9247f4c94351d0cf7d75c16146785eb8 (patch)
tree9408513d7a0fa50c91de5f32223c46ac41e28269
parent74d33293e467df61de1b1d8b2fbe29e550dec33b (diff)
iommu/vt-d: Avoid format string leaks into iommu_device_create
This makes sure it won't be possible to accidentally leak format strings into iommu device names. Current name allocations are safe, but this makes the "%s" explicit. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r--drivers/iommu/dmar.c2
-rw-r--r--drivers/iommu/intel-iommu.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index c9db04d4ef39..8757f8dfc4e5 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -1068,7 +1068,7 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd)
1068 if (intel_iommu_enabled) 1068 if (intel_iommu_enabled)
1069 iommu->iommu_dev = iommu_device_create(NULL, iommu, 1069 iommu->iommu_dev = iommu_device_create(NULL, iommu,
1070 intel_iommu_groups, 1070 intel_iommu_groups,
1071 iommu->name); 1071 "%s", iommu->name);
1072 1072
1073 return 0; 1073 return 0;
1074 1074
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 0649b94f5958..0be23c589d3b 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -4533,7 +4533,7 @@ int __init intel_iommu_init(void)
4533 for_each_active_iommu(iommu, drhd) 4533 for_each_active_iommu(iommu, drhd)
4534 iommu->iommu_dev = iommu_device_create(NULL, iommu, 4534 iommu->iommu_dev = iommu_device_create(NULL, iommu,
4535 intel_iommu_groups, 4535 intel_iommu_groups,
4536 iommu->name); 4536 "%s", iommu->name);
4537 4537
4538 bus_set_iommu(&pci_bus_type, &intel_iommu_ops); 4538 bus_set_iommu(&pci_bus_type, &intel_iommu_ops);
4539 bus_register_notifier(&pci_bus_type, &device_nb); 4539 bus_register_notifier(&pci_bus_type, &device_nb);