Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1523952 > unrolled thread

[PATCH] bus: mvebu-mbus: fix iounmap() in error path

Started byLuis Henriques <henrix@camandro.org>
First post2016-11-17 00:00 +0100
Last post2016-11-18 13:50 +0100
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] bus: mvebu-mbus: fix iounmap() in error path Luis Henriques <henrix@camandro.org> - 2016-11-17 00:00 +0100
    Re: [PATCH] bus: mvebu-mbus: fix iounmap() in error path Gregory CLEMENT <gregory.clement@free-electrons.com> - 2016-11-18 13:50 +0100

#1523952 — [PATCH] bus: mvebu-mbus: fix iounmap() in error path

FromLuis Henriques <henrix@camandro.org>
Date2016-11-17 00:00 +0100
Subject[PATCH] bus: mvebu-mbus: fix iounmap() in error path
Message-ID<sEhlo-Bi-27@gated-at.bofh.it>
This patch fixes the following Coccinelle error:

./drivers/bus/mvebu-mbus.c:1115:2-8: \
	ERROR: missing iounmap; ioremap on line 1108 \
	and execution via conditional on line 1113

Although all mvebu_mbus_common_init() callers seem to actually use
&mbus_state in the 1st argument, this is still a bug that could be
triggered by future changes.

Signed-off-by: Luis Henriques <henrix@camandro.org>
---
 drivers/bus/mvebu-mbus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index c7f396903184..449466eff56f 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -1111,7 +1111,7 @@ static int __init mvebu_mbus_common_init(struct mvebu_mbus_state *mbus,
 
 	mbus->sdramwins_base = ioremap(sdramwins_phys_base, sdramwins_size);
 	if (!mbus->sdramwins_base) {
-		iounmap(mbus_state.mbuswins_base);
+		iounmap(mbus->mbuswins_base);
 		return -ENOMEM;
 	}
 

[toc] | [next] | [standalone]


#1525276

FromGregory CLEMENT <gregory.clement@free-electrons.com>
Date2016-11-18 13:50 +0100
Message-ID<sEQM9-7ax-21@gated-at.bofh.it>
In reply to#1523952
Hi Luis,
 
 On mer., nov. 16 2016, Luis Henriques <henrix@camandro.org> wrote:

> This patch fixes the following Coccinelle error:
>
> ./drivers/bus/mvebu-mbus.c:1115:2-8: \
> 	ERROR: missing iounmap; ioremap on line 1108 \
> 	and execution via conditional on line 1113
>
> Although all mvebu_mbus_common_init() callers seem to actually use
> &mbus_state in the 1st argument, this is still a bug that could be
> triggered by future changes.
>
> Signed-off-by: Luis Henriques <henrix@camandro.org>

Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

and applied on mvebu/dt

Thanks,

Gregory

> ---
>  drivers/bus/mvebu-mbus.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
> index c7f396903184..449466eff56f 100644
> --- a/drivers/bus/mvebu-mbus.c
> +++ b/drivers/bus/mvebu-mbus.c
> @@ -1111,7 +1111,7 @@ static int __init mvebu_mbus_common_init(struct mvebu_mbus_state *mbus,
>  
>  	mbus->sdramwins_base = ioremap(sdramwins_phys_base, sdramwins_size);
>  	if (!mbus->sdramwins_base) {
> -		iounmap(mbus_state.mbuswins_base);
> +		iounmap(mbus->mbuswins_base);
>  		return -ENOMEM;
>  	}
>  

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web