Commit a7990c64 authored by Artem Savkov's avatar Artem Savkov Committed by Joerg Roedel
Browse files

iommu/arm-smmu: fix null-pointer dereference in arm_smmu_add_device

Commit c54451a5

 "iommu/arm-smmu: Fix the error path in arm_smmu_add_device"
removed fwspec assignment in legacy_binding path as redundant which is
wrong. It needs to be updated after fwspec initialisation in
arm_smmu_register_legacy_master() as it is dereferenced later. Without
this there is a NULL-pointer dereference panic during boot on some hosts.
Signed-off-by: default avatarArtem Savkov <>
Reviewed-by: default avatarRobin Murphy <>
Acked-by: default avatarWill Deacon <>
Signed-off-by: default avatarJoerg Roedel <>
parent 74ddda71
......@@ -1519,6 +1519,13 @@ static int arm_smmu_add_device(struct device *dev)
if (using_legacy_binding) {
ret = arm_smmu_register_legacy_master(dev, &smmu);
* If dev->iommu_fwspec is initally NULL, arm_smmu_register_legacy_master()
* will allocate/initialise a new one. Thus we need to update fwspec for
* later use.
fwspec = dev->iommu_fwspec;
if (ret)
goto out_free;
} else if (fwspec && fwspec->ops == &arm_smmu_ops) {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment