lkml.org 
[lkml]   [2018]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 169/310] mtd: nand: gpmi: Fix gpmi_nand_init() error path
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Boris Brezillon <boris.brezillon@free-electrons.com>


    [ Upstream commit 4d02423e9afe6c46142ce98bbcaf5167316dbfbf ]

    The GPMI driver is wrongly assuming that nand_release() can safely be
    called on an uninitialized/unregistered NAND device.

    Add a new err_nand_cleanup label in the error path and only execute if
    nand_scan_tail() succeeded.

    Note that we now call nand_cleanup() instead of nand_release()
    (nand_release() is actually grouping the mtd_device_unregister() and
    nand_cleanup() in one call) because there's no point in trying to
    unregister a device that has never been registered.

    Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
    Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
    Acked-by: Han Xu <han.xu@nxp.com>
    Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
    +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
    @@ -2047,18 +2047,20 @@ static int gpmi_nand_init(struct gpmi_na

    ret = nand_boot_init(this);
    if (ret)
    - goto err_out;
    + goto err_nand_cleanup;
    ret = chip->scan_bbt(mtd);
    if (ret)
    - goto err_out;
    + goto err_nand_cleanup;

    ret = mtd_device_register(mtd, NULL, 0);
    if (ret)
    - goto err_out;
    + goto err_nand_cleanup;
    return 0;

    +err_nand_cleanup:
    + nand_cleanup(chip);
    err_out:
    - gpmi_nand_exit(this);
    + gpmi_free_dma_buffer(this);
    return ret;
    }


    \
     
     \ /
      Last update: 2018-04-11 21:44    [W:4.156 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site