arm64/iommu: Fix a resource leak in smmu_domain_alloc()
We should free the allocated ASID if smmu_init_cd() fails. Move the allocation of "domain" to simplify the first error path. Reported by: Kevin Day <kevin@your.org> Reviewed by: br MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54676
This commit is contained in:
@@ -1698,22 +1698,21 @@ smmu_domain_alloc(device_t dev, struct iommu_unit *iommu)
|
||||
|
||||
unit = (struct smmu_unit *)iommu;
|
||||
|
||||
domain = malloc(sizeof(*domain), M_SMMU, M_WAITOK | M_ZERO);
|
||||
|
||||
error = smmu_asid_alloc(sc, &new_asid);
|
||||
if (error) {
|
||||
free(domain, M_SMMU);
|
||||
device_printf(sc->dev,
|
||||
"Could not allocate ASID for a new domain.\n");
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
domain = malloc(sizeof(*domain), M_SMMU, M_WAITOK | M_ZERO);
|
||||
domain->asid = (uint16_t)new_asid;
|
||||
|
||||
smmu_pmap_pinit(&domain->p);
|
||||
|
||||
error = smmu_init_cd(sc, domain);
|
||||
if (error) {
|
||||
smmu_asid_free(sc, domain->asid);
|
||||
free(domain, M_SMMU);
|
||||
device_printf(sc->dev, "Could not initialize CD\n");
|
||||
return (NULL);
|
||||
|
||||
Reference in New Issue
Block a user