iommu/arm-smmu-v3: Revert vmaster in the error path
Subsystems (2)
PATCH v2 1/1 iommu/arm-smmu-v3: Revert vmaster in the error path
The error path for err_free_master_domain leaks the vmaster. Move all the kfrees for vmaster into the goto error section.
Fixes cfea71aea921 ("iommu/arm-smmu-v3: Put iopf enablement in the domain attach path")
Reviewed-by Jason Gunthorpe <[email protected]>
Reviewed-by Pranjal Shrivastava <[email protected]>
Signed-off-by Nicolin Chen <[email protected]>
---
Changelog
v2:
* Simplify commit message
* Add "Reviewed-by" from Jason and Pranjal
v1:
https://lore.kernel.org/all/[email protected]/
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +4 -3
@@ -2906,8 +2906,8 @@ int arm_smmu_attach_prepare(struct arm_smmu_attach_state *state, master_domain =kzalloc (sizeof (*master_domain),GFP_KERNEL );if (!master_domain) { -kfree (state->vmaster); -return -ENOMEM ; + ret = -ENOMEM ; + goto err_free_vmaster; } master_domain->domain = new_domain; master_domain->master = master;
@@ -2941,7 +2941,6 @@ int arm_smmu_attach_prepare(struct arm_smmu_attach_state *state, !arm_smmu_master_canwbs(master)) {spin_unlock_irqrestore (&smmu_domain->devices_lock, flags); -kfree (state->vmaster); ret = -EINVAL ; goto err_iopf; }
@@ -2967,6 +2966,8 @@ int arm_smmu_attach_prepare(struct arm_smmu_attach_state *state,arm_smmu_disable_iopf (master, master_domain); err_free_master_domain:kfree (master_domain); +err_free_vmaster: +kfree (state->vmaster);return ret; }
Signature · 1 line
2.43.0
Quoted 4 lines · Nicolin Chen
The error path for
err_free_master_domainleaks the vmaster. Move all the kfrees for vmaster into the goto error section.
Applied to iommu (arm/smmu/updates), thanks!
[1/1] iommu/arm-smmu-v3: Revert vmaster in the error path
https://git.kernel.org/iommu/c/49f42634e805
Cheers,
Signature · 5 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev