2018-06-12 03:16:03

by Zhouyang Jia

Subject: [PATCH] mtd: gpio_flash: add error handling for ioremap_nocache

When ioremap_nocache fails, the lack of error-handling code may
cause unexpected results.

This patch adds error-handling code after calling ioremap_nocache.

Signed-off-by: Zhouyang Jia <[email protected]>
---
drivers/mtd/maps/gpio-addr-flash.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c
index 385305e..7fbba02 100644
--- a/drivers/mtd/maps/gpio-addr-flash.c
+++ b/drivers/mtd/maps/gpio-addr-flash.c
@@ -242,6 +242,9 @@ static int gpio_flash_probe(struct platform_device *pdev)
state->map.phys = NO_XIP;
state->map.map_priv_1 = (unsigned long)state;

+ if (!state->map.virt)
+ return -ENOMEM;
+
platform_set_drvdata(pdev, state);

i = 0;
--
2.7.4

2018-06-21 22:23:50

by Boris Brezillon

Subject: Re: [PATCH] mtd: gpio_flash: add error handling for ioremap_nocache

On Tue, 12 Jun 2018 11:15:00 +0800
Zhouyang Jia <[email protected]> wrote:

> When ioremap_nocache fails, the lack of error-handling code may
> cause unexpected results.
>
> This patch adds error-handling code after calling ioremap_nocache.
>
> Signed-off-by: Zhouyang Jia <[email protected]>
> ---
> drivers/mtd/maps/gpio-addr-flash.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c
> index 385305e..7fbba02 100644
> --- a/drivers/mtd/maps/gpio-addr-flash.c
> +++ b/drivers/mtd/maps/gpio-addr-flash.c
> @@ -242,6 +242,9 @@ static int gpio_flash_probe(struct platform_device *pdev)
> state->map.phys = NO_XIP;
> state->map.map_priv_1 = (unsigned long)state;
>
> + if (!state->map.virt)
> + return -ENOMEM;

Please move the test just after the ioremap_nocache() call. Also, I see
that iounmap() is never called. Probably a good opportunity to switch
to devm_ funcs.

> +
> platform_set_drvdata(pdev, state);
>
> i = 0;

2018-06-22 01:54:55

by Zhouyang Jia

Subject: [PATCH v2] mtd: gpio_flash: add error handling for ioremap_nocache

When ioremap_nocache fails, the lack of error-handling code may
cause unexpected results.

This patch adds error-handling code after calling ioremap_nocache.

Signed-off-by: Zhouyang Jia <[email protected]>
---
v1->v2:
- Move the test just after the ioremap_nocache() call.
---
drivers/mtd/maps/gpio-addr-flash.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c
index 385305e..9d97236 100644
--- a/drivers/mtd/maps/gpio-addr-flash.c
+++ b/drivers/mtd/maps/gpio-addr-flash.c
@@ -239,6 +239,9 @@ static int gpio_flash_probe(struct platform_device *pdev)
state->map.bankwidth = pdata->width;
state->map.size = state->win_size * (1 << state->gpio_count);
state->map.virt = ioremap_nocache(memory->start, state->map.size);
+ if (!state->map.virt)
+ return -ENOMEM;
+
state->map.phys = NO_XIP;
state->map.map_priv_1 = (unsigned long)state;

--
2.7.4

2018-07-07 10:00:48

by Boris Brezillon

Subject: Re: [PATCH v2] mtd: gpio_flash: add error handling for ioremap_nocache

On Fri, 22 Jun 2018 09:52:20 +0800
Zhouyang Jia <[email protected]> wrote:

> When ioremap_nocache fails, the lack of error-handling code may
> cause unexpected results.
>
> This patch adds error-handling code after calling ioremap_nocache.
>
> Signed-off-by: Zhouyang Jia <[email protected]>

Applied.

Thanks,

Boris

> ---
> v1->v2:
> - Move the test just after the ioremap_nocache() call.
> ---
> drivers/mtd/maps/gpio-addr-flash.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c
> index 385305e..9d97236 100644
> --- a/drivers/mtd/maps/gpio-addr-flash.c
> +++ b/drivers/mtd/maps/gpio-addr-flash.c
> @@ -239,6 +239,9 @@ static int gpio_flash_probe(struct platform_device *pdev)
> state->map.bankwidth = pdata->width;
> state->map.size = state->win_size * (1 << state->gpio_count);
> state->map.virt = ioremap_nocache(memory->start, state->map.size);
> + if (!state->map.virt)
> + return -ENOMEM;
> +
> state->map.phys = NO_XIP;
> state->map.map_priv_1 = (unsigned long)state;
>