[PATCH 1/2] mtd: nand: gpmi: Fix gpmi_nand_init() error path

[PATCH 1/2] mtd: nand: gpmi: Fix gpmi_nand_init() error path

[Boris Brezillon]

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>
---
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index d52139635b67..92279a0d52f1 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -2048,18 +2048,20 @@ static int gpmi_nand_init(struct gpmi_nand_data *this)
 
 	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;
 }
 
-- 
2.7.4

[PATCH 2/2] mtd: nand: gpmi: Kill gpmi_nand_exit()

[Boris Brezillon]

The only user of gpmi_nand_exit() is gpmi_nand_remove(). Move its content
to the caller.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 92279a0d52f1..f22eeedc728f 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -1929,12 +1929,6 @@ static int gpmi_set_geometry(struct gpmi_nand_data *this)
 	return gpmi_alloc_dma_buffer(this);
 }
 
-static void gpmi_nand_exit(struct gpmi_nand_data *this)
-{
-	nand_release(nand_to_mtd(&this->nand));
-	gpmi_free_dma_buffer(this);
-}
-
 static int gpmi_init_last(struct gpmi_nand_data *this)
 {
 	struct nand_chip *chip = &this->nand;
@@ -2131,7 +2125,8 @@ static int gpmi_nand_remove(struct platform_device *pdev)
 {
 	struct gpmi_nand_data *this = platform_get_drvdata(pdev);
 
-	gpmi_nand_exit(this);
+	nand_release(nand_to_mtd(&this->nand));
+	gpmi_free_dma_buffer(this);
 	release_resources(this);
 	return 0;
 }
-- 
2.7.4

Re: [PATCH 1/2] mtd: nand: gpmi: Fix gpmi_nand_init() error path

[Marek Vasut]

On 04/10/2017 10:35 AM, Boris Brezillon wrote:
> 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>

> ---
>  drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> index d52139635b67..92279a0d52f1 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> @@ -2048,18 +2048,20 @@ static int gpmi_nand_init(struct gpmi_nand_data *this)
>  
>  	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;
>  }
>  
> 


-- 
Best regards,
Marek Vasut

Re: [PATCH 2/2] mtd: nand: gpmi: Kill gpmi_nand_exit()

[Marek Vasut]

On 04/10/2017 10:35 AM, Boris Brezillon wrote:
> The only user of gpmi_nand_exit() is gpmi_nand_remove(). Move its content
> to the caller.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>

Super, thanks.

Reviewed-by: Marek Vasut <marek.vasut@gmail.com>

> ---
>  drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> index 92279a0d52f1..f22eeedc728f 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> @@ -1929,12 +1929,6 @@ static int gpmi_set_geometry(struct gpmi_nand_data *this)
>  	return gpmi_alloc_dma_buffer(this);
>  }
>  
> -static void gpmi_nand_exit(struct gpmi_nand_data *this)
> -{
> -	nand_release(nand_to_mtd(&this->nand));
> -	gpmi_free_dma_buffer(this);
> -}
> -
>  static int gpmi_init_last(struct gpmi_nand_data *this)
>  {
>  	struct nand_chip *chip = &this->nand;
> @@ -2131,7 +2125,8 @@ static int gpmi_nand_remove(struct platform_device *pdev)
>  {
>  	struct gpmi_nand_data *this = platform_get_drvdata(pdev);
>  
> -	gpmi_nand_exit(this);
> +	nand_release(nand_to_mtd(&this->nand));
> +	gpmi_free_dma_buffer(this);
>  	release_resources(this);
>  	return 0;
>  }
> 


-- 
Best regards,
Marek Vasut

Re: [PATCH 1/2] mtd: nand: gpmi: Fix gpmi_nand_init() error path

[Han Xu]

From: Marek Vasut <marek.vasut@gmail.com>
Sent: Saturday, April 15, 2017 8:58 AM
To: Boris Brezillon; Richard Weinberger; linux-mtd@lists.infradead.org
Cc: David Woodhouse; Brian Norris; Cyrille Pitchen; Han Xu; Shawn Guo; Sascha Hauer; Leonard Crestez; Masahiro Yamada
Subject: Re: [PATCH 1/2] mtd: nand: gpmi: Fix gpmi_nand_init() error path

On 04/10/2017 10:35 AM, Boris Brezillon wrote:
> 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>

Acked-by: Han Xu <han.xu@nxp.com>
Reviewed-by: Marek Vasut <marek.vasut@gmail.com>

> ---
>  drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> index d52139635b67..92279a0d52f1 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> @@ -2048,18 +2048,20 @@ static int gpmi_nand_init(struct gpmi_nand_data *this)
>
>       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;
>  }
>
>


--
Best regards,
Marek Vasut

Re: [PATCH 2/2] mtd: nand: gpmi: Kill gpmi_nand_exit()

[Han Xu]

On Sat, Apr 15, 2017 at 9:58 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
>
> On 04/10/2017 10:35 AM, Boris Brezillon wrote:
> > The only user of gpmi_nand_exit() is gpmi_nand_remove(). Move its content
> > to the caller.
> >
> > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
>
> Super, thanks.
>
> Reviewed-by: Marek Vasut <marek.vasut@gmail.com>

Acked-by: Han Xu <han.xu@nxp.com>
>
>
> > ---
> >  drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 ++-------
> >  1 file changed, 2 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> > index 92279a0d52f1..f22eeedc728f 100644
> > --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> > +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> > @@ -1929,12 +1929,6 @@ static int gpmi_set_geometry(struct gpmi_nand_data *this)
> >       return gpmi_alloc_dma_buffer(this);
> >  }
> >
> > -static void gpmi_nand_exit(struct gpmi_nand_data *this)
> > -{
> > -     nand_release(nand_to_mtd(&this->nand));
> > -     gpmi_free_dma_buffer(this);
> > -}
> > -
> >  static int gpmi_init_last(struct gpmi_nand_data *this)
> >  {
> >       struct nand_chip *chip = &this->nand;
> > @@ -2131,7 +2125,8 @@ static int gpmi_nand_remove(struct platform_device *pdev)
> >  {
> >       struct gpmi_nand_data *this = platform_get_drvdata(pdev);
> >
> > -     gpmi_nand_exit(this);
> > +     nand_release(nand_to_mtd(&this->nand));
> > +     gpmi_free_dma_buffer(this);
> >       release_resources(this);
> >       return 0;
> >  }
> >
>
>
> --
> Best regards,
> Marek Vasut
>
> ______________________________________________________
> Linux MTD discussion mailing list
> http://lists.infradead.org/mailman/listinfo/linux-mtd/




-- 
Sincerely,

Han XU

Re: [PATCH 1/2] mtd: nand: gpmi: Fix gpmi_nand_init() error path

[Boris Brezillon]

On Mon, 10 Apr 2017 10:35:17 +0200
Boris Brezillon <boris.brezillon@free-electrons.com> wrote:

> 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>

Applied both to nand/next.

> ---
>  drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> index d52139635b67..92279a0d52f1 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> @@ -2048,18 +2048,20 @@ static int gpmi_nand_init(struct gpmi_nand_data *this)
>  
>  	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;
>  }
>