Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Sun, 25 Apr 2021 16:49:36 +0300
From:   Leon Romanovsky <leon@kernel.org>
To:     Lv Yunlong <lyl2019@mail.ustc.edu.cn>
Cc:     bmt@zurich.ibm.com, dledford@redhat.com, jgg@ziepe.ca,
        linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] rdma/siw: Fix a use after free in siw_alloc_mr
Message-ID: <YIVzcBMCtvlFov4W@unreal>
References: <20210425132001.3994-1-lyl2019@mail.ustc.edu.cn>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210425132001.3994-1-lyl2019@mail.ustc.edu.cn>
Precedence: bulk

On Sun, Apr 25, 2021 at 06:20:01AM -0700, Lv Yunlong wrote:
> Our code analyzer reported a uaf.
> 
> In siw_alloc_mr, it calls siw_mr_add_mem(mr,..). In the implementation
> of siw_mr_add_mem(), mem is assigned to mr->mem and then mem is freed
> via kfree(mem) if xa_alloc_cyclic() failed. Here, mr->mem still point
> to a freed object. After, the execution continue up to the err_out branch
> of siw_alloc_mr, and the freed mr->mem is used in siw_mr_drop_mem(mr).
> 
> Fixes: 2251334dcac9e ("rdma/siw: application buffer management")
> Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
> ---
>  drivers/infiniband/sw/siw/siw_mem.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/infiniband/sw/siw/siw_mem.c b/drivers/infiniband/sw/siw/siw_mem.c
> index 34a910cf0edb..3bde3b6fca05 100644
> --- a/drivers/infiniband/sw/siw/siw_mem.c
> +++ b/drivers/infiniband/sw/siw/siw_mem.c
> @@ -114,6 +114,7 @@ int siw_mr_add_mem(struct siw_mr *mr, struct ib_pd *pd, void *mem_obj,
>  	if (xa_alloc_cyclic(&sdev->mem_xa, &id, mem, limit, &next,
>  	    GFP_KERNEL) < 0) {
>  		kfree(mem);
> +		mr->mem = NULL;
>  		return -ENOMEM;
>  	}

Please move "mr->mem = mem;" assignment to be here, after if (...) {} section.

Thanks

>  	/* Set the STag index part */
> -- 
> 2.25.1
> 
>