lkml.org 
[lkml]   [2015]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2 126/134] IB/mlx5: avoid destroying a NULL mr in reg_user_mr error flow
    Date
    4.2-stable review patch.  If anyone has any objections, please let me know.

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

    From: Haggai Eran <haggaie@mellanox.com>

    commit 11d748045c6dadb279d1acdb6d2ea8f3f2ede85b upstream.

    The mlx5_ib_reg_user_mr() function will attempt to call clean_mr() in
    its error flow even though there is never a case where the error flow
    occurs with a valid MR pointer to destroy.

    Remove the clean_mr() call and the incorrect comment above it.

    Fixes: b4cfe447d47b ("IB/mlx5: Implement on demand paging by adding
    support for MMU notifiers")
    Cc: Eli Cohen <eli@mellanox.com>
    Signed-off-by: Haggai Eran <haggaie@mellanox.com>
    Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
    Signed-off-by: Doug Ledford <dledford@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/infiniband/hw/mlx5/mr.c | 12 ------------
    1 file changed, 12 deletions(-)

    --- a/drivers/infiniband/hw/mlx5/mr.c
    +++ b/drivers/infiniband/hw/mlx5/mr.c
    @@ -1118,19 +1118,7 @@ struct ib_mr *mlx5_ib_reg_user_mr(struct
    return &mr->ibmr;

    error:
    - /*
    - * Destroy the umem *before* destroying the MR, to ensure we
    - * will not have any in-flight notifiers when destroying the
    - * MR.
    - *
    - * As the MR is completely invalid to begin with, and this
    - * error path is only taken if we can't push the mr entry into
    - * the pagefault tree, this is safe.
    - */
    -
    ib_umem_release(umem);
    - /* Kill the MR, and return an error code. */
    - clean_mr(mr);
    return ERR_PTR(err);
    }




    \
     
     \ /
      Last update: 2015-09-27 00:21    [W:4.044 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site