lkml.org 
[lkml]   [2012]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 64/86] iommu/msm: Fix error handling in msm_iommu_unmap()
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Joerg Roedel <joerg.roedel@amd.com>

    commit 05df1f3c2afaef5672627f2b7095f0d4c4dbc3a0 upstream.

    Error handling in msm_iommu_unmap() is broken. On some error
    conditions retval is set to a non-zero value which causes
    the function to return 'len' at the end. This hides the
    error from the user. Zero should be returned in those error
    cases.

    Cc: David Brown <davidb@codeaurora.org>
    Cc: Stepan Moskovchenko <stepanm@codeaurora.org>
    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    Acked-by: David Brown <davidb@codeaurora.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/iommu/msm_iommu.c | 7 +------
    1 file changed, 1 insertion(+), 6 deletions(-)

    --- a/drivers/iommu/msm_iommu.c
    +++ b/drivers/iommu/msm_iommu.c
    @@ -481,23 +481,19 @@ static int msm_iommu_unmap(struct iommu_

    priv = domain->priv;

    - if (!priv) {
    - ret = -ENODEV;
    + if (!priv)
    goto fail;
    - }

    fl_table = priv->pgtable;

    if (len != SZ_16M && len != SZ_1M &&
    len != SZ_64K && len != SZ_4K) {
    pr_debug("Bad length: %d\n", len);
    - ret = -EINVAL;
    goto fail;
    }

    if (!fl_table) {
    pr_debug("Null page table\n");
    - ret = -EINVAL;
    goto fail;
    }

    @@ -506,7 +502,6 @@ static int msm_iommu_unmap(struct iommu_

    if (*fl_pte == 0) {
    pr_debug("First level PTE is 0\n");
    - ret = -ENODEV;
    goto fail;
    }




    \
     
     \ /
      Last update: 2012-02-11 00:07    [W:0.021 / U:296.840 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site