linux-kernel - Re: [PATCH] RDMA/rxe: Correct error handling in routines allocating xarray entries

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 1 Aug 2022 15:51:38 +0800
From:   Zhu Yanjun <zyjzyj2000@...il.com>
To:     William Kucharski <william.kucharski@...cle.com>
Cc:     Jason Gunthorpe <jgg@...pe.ca>, Leon Romanovsky <leon@...nel.org>,
        Bob Pearson <rpearsonhpe@...il.com>,
        RDMA mailing list <linux-rdma@...r.kernel.org>,
        LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] RDMA/rxe: Correct error handling in routines allocating
 xarray entries

On Mon, Aug 1, 2022 at 3:39 PM William Kucharski
<william.kucharski@...cle.com> wrote:
>
> The current code will report an error if xa_alloc_cyclic() returns
> non-zero, but it will return 1 if it wrapped indices before successfully
> allocating an entry.
>
> An error should only be reported if the call actually failed (denoted by
> a return value < 0.)
>
> Fixes: 3225717f6dfa2 ("RDMA/rxe: Replace red-black trees by xarrays")
> Signed-off-by: William Kucharski <william.kucharski@...cle.com>

Please check commit in
https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git

commit 1a685940e6200e9def6e34bbaa19dd31dc5aeaf8
Author: Dongliang Mu <mudongliangabcd@...il.com>
Date:   Thu Jun 9 15:06:56 2022 +0800

    RDMA/rxe: fix xa_alloc_cycle() error return value check again

    Currently rxe_alloc checks ret to indicate error, but 1 is also a valid
    return and just indicates that the allocation succeeded with a wrap.

    Fix this by modifying the check to be < 0.

    Link: https://lore.kernel.org/r/20220609070656.1446121-1-dzm91@hust.edu.cn
    Fixes: 3225717f6dfa ("RDMA/rxe: Replace red-black trees by xarrays")
    Signed-off-by: Dongliang Mu <mudongliangabcd@...il.com>
    Reviewed-by: Bob Pearson <rpearsonhpe@...il.com>
    Signed-off-by: Leon Romanovsky <leon@...nel.org>

Thanks and Regards,
Zhu Yanjun

> ---
>  drivers/infiniband/sw/rxe/rxe_pool.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/infiniband/sw/rxe/rxe_pool.c b/drivers/infiniband/sw/rxe/rxe_pool.c
> index 19b14826385b..e9f3bbd8d605 100644
> --- a/drivers/infiniband/sw/rxe/rxe_pool.c
> +++ b/drivers/infiniband/sw/rxe/rxe_pool.c
> @@ -139,7 +139,7 @@ void *rxe_alloc(struct rxe_pool *pool)
>
>         err = xa_alloc_cyclic(&pool->xa, &elem->index, elem, pool->limit,
>                               &pool->next, GFP_KERNEL);
> -       if (err)
> +       if (err < 0)
>                 goto err_free;
>
>         return obj;
> @@ -167,7 +167,7 @@ int __rxe_add_to_pool(struct rxe_pool *pool, struct rxe_pool_elem *elem)
>
>         err = xa_alloc_cyclic(&pool->xa, &elem->index, elem, pool->limit,
>                               &pool->next, GFP_KERNEL);
> -       if (err)
> +       if (err < 0)
>                 goto err_cnt;
>
>         return 0;
> --
> 2.37.1
>