On Tue, Dec 29, 2015 at 12:10:11AM -0500, Nicholas Krause wrote:
> This adds the proper check to alloc_iommu to make sure that the call
> to iommu_device_create has completed successfully and if not return
> to the caller the error code returned after freeing up resources
> allocated previously by alloc_iommu.
> 
> Signed-off-by: Nicholas Krause <[email protected]>
> ---
>  drivers/iommu/dmar.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
> index 80e3c17..27333b6 100644
> --- a/drivers/iommu/dmar.c
> +++ b/drivers/iommu/dmar.c
> @@ -1069,9 +1069,12 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd)
>               iommu->iommu_dev = iommu_device_create(NULL, iommu,
>                                                      intel_iommu_groups,
>                                                      "%s", iommu->name);
> +     if (IS_ERR(iommu->iommu_dev)) {
> +             err = PTR_ERR(iommu->iommu_dev);
> +             goto err_unmap;
> +     }

This leaves a dangling pointer to the iommu in drhd->iommu.

>  
>       return 0;
> -

That blank line improves readability of the code, please leave it in.

>  err_unmap:
>       unmap_iommu(iommu);
>  error_free_seq_id:

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to