linux-kernel - Re: [PATCH 2/2] zpool: Use common error handling code in zpool_create

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] [day] [month] [year] [list]

Message-ID: <CALZtONAL23OdgQauR28ToqVhvRz2yT9LhVq+8jm3C0g_WVMS6g@mail.gmail.com>
Date:   Wed, 16 Aug 2017 07:19:40 -0400
From:   Dan Streetman <ddstreet@...e.org>
To:     SF Markus Elfring <elfring@...rs.sourceforge.net>
Cc:     Linux-MM <linux-mm@...ck.org>, LKML <linux-kernel@...r.kernel.org>,
        kernel-janitors@...r.kernel.org
Subject: Re: [PATCH 2/2] zpool: Use common error handling code in zpool_create_pool()

On Mon, Aug 14, 2017 at 7:16 AM, SF Markus Elfring
<elfring@...rs.sourceforge.net> wrote:
> From: Markus Elfring <elfring@...rs.sourceforge.net>
> Date: Mon, 14 Aug 2017 13:04:33 +0200
>
> Add a jump target so that a bit of exception handling can be better reused
> in this function.
>
> Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net>

Acked-by: Dan Streetman <ddstreet@...e.org>

> ---
>  mm/zpool.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/mm/zpool.c b/mm/zpool.c
> index fe1943f7d844..e4634edef86d 100644
> --- a/mm/zpool.c
> +++ b/mm/zpool.c
> @@ -171,10 +171,8 @@ struct zpool *zpool_create_pool(const char *type, const char *name, gfp_t gfp,
>         }
>
>         zpool = kmalloc(sizeof(*zpool), gfp);
> -       if (!zpool) {
> -               zpool_put_driver(driver);
> -               return NULL;
> -       }
> +       if (!zpool)
> +               goto put_driver;
>
>         zpool->driver = driver;
>         zpool->pool = driver->create(name, gfp, ops, zpool);
> @@ -182,8 +180,9 @@ struct zpool *zpool_create_pool(const char *type, const char *name, gfp_t gfp,
>
>         if (!zpool->pool) {
>                 pr_err("couldn't create %s pool\n", type);
> -               zpool_put_driver(driver);
>                 kfree(zpool);
> +put_driver:
> +               zpool_put_driver(driver);
>                 return NULL;
>         }
>
> --
> 2.14.0
>