Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
In-Reply-To: <20171031101647.45111-1-tbogendoerfer@suse.de>
References: <20171031101647.45111-1-tbogendoerfer@suse.de>
From:   Moni Shoua <monis@mellanox.com>
Date:   Tue, 31 Oct 2017 13:08:46 +0200
Message-ID: <CAG9sBKPFGjz8TE-M7_ak3kCypG6m6fJvFpeL3DXEjhjvo_0yWw@mail.gmail.com>
Subject: Re: [PATCH v2] IB/rxe: don't crash, if allocation of crc algorithm failed
To:     Thomas Bogendoerfer <tbogendoerfer@suse.de>
Cc:     Doug Ledford <dledford@redhat.com>,
        linux-rdma <linux-rdma@vger.kernel.org>,
        Linux Kernel Mailinglist <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Tue, Oct 31, 2017 at 12:16 PM, Thomas Bogendoerfer
<tbogendoerfer@suse.de> wrote:
> Following crash happens, if crc algorithm couldn't be allocated:
>
> [ 1087.989072] rdma_rxe: loaded
> [ 1097.855397] PCLMULQDQ-NI instructions are not detected.
> [ 1097.901220] rdma_rxe: failed to allocate crc algorithmi err:-2
> [ 1097.901248] BUG: unable to handle kernel
> [ 1097.901249] NULL pointer dereference
> [ 1097.901250]  at 0000000000000046
> [...]
>
> Reason is that rxe->tfm is assigned the error return, which will then
> be used for crypto_free_shash() in rxe_cleanup. Fix by using a
> temporary variable and assigning it rxe->tfm after allocation succeeded.
>
> Fixes: cee2688e3cd6 ("IB/rxe: Offload CRC calculation when possible")
> Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
> ---
>  drivers/infiniband/sw/rxe/rxe_verbs.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
> index ff77f4f66970..d03002b9d84d 100644
> --- a/drivers/infiniband/sw/rxe/rxe_verbs.c
> +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
> @@ -1192,6 +1192,7 @@ int rxe_register_device(struct rxe_dev *rxe)
>         int err;
>         int i;
>         struct ib_device *dev = &rxe->ib_dev;
> +       struct crypto_shash *tfm;
>
>         strlcpy(dev->name, "rxe%d", IB_DEVICE_NAME_MAX);
>         strlcpy(dev->node_desc, "rxe", sizeof(dev->node_desc));
> @@ -1289,12 +1290,13 @@ int rxe_register_device(struct rxe_dev *rxe)
>         dev->get_hw_stats = rxe_ib_get_hw_stats;
>         dev->alloc_hw_stats = rxe_ib_alloc_hw_stats;
>
> -       rxe->tfm = crypto_alloc_shash("crc32", 0, 0);
> -       if (IS_ERR(rxe->tfm)) {
> +       tfm = crypto_alloc_shash("crc32", 0, 0);
> +       if (IS_ERR(tfm)) {
>                 pr_err("failed to allocate crc algorithm err:%ld\n",
> -                      PTR_ERR(rxe->tfm));
> -               return PTR_ERR(rxe->tfm);
> +                      PTR_ERR(tfm));
> +               return PTR_ERR(tfm);
>         }
> +       rxe->tfm = tfm;
>
>         err = ib_register_device(dev, NULL);
>         if (err) {
> --
> 2.12.3
>
> --
Thanks

Acked-by: Moni Shoua <monis@mellanox.com>

From 1582770108858931439@xxx Tue Oct 31 10:53:21 +0000 2017
X-GM-THRID: 1582767969690511996
X-Gmail-Labels: Inbox,Category Forums