linux-kernel - [WATCHDOG] v2.6.32-rc8 fix - rc32434_wdt.c: correct size for ioremap

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: <20091202131859.GA21591@infomag.iguana.be>
Date:	Wed, 2 Dec 2009 14:18:59 +0100
From:	Wim Van Sebroeck <wim@...ana.be>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	LKML <linux-kernel@...r.kernel.org>,
	H Hartley Sweeten <hsweeten@...ionengravers.com>,
	Florian Fainelli <florian@...nwrt.org>
Subject: [WATCHDOG] v2.6.32-rc8 fix - rc32434_wdt.c: correct size for
	ioremap_nocache & modulestring

Hi Linus,

> Please pull from 'master' branch of
> 	git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
> or if master.kernel.org hasn't synced up yet:
> 	master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
> 
> This will update the following files:
> 
>  drivers/watchdog/rc32434_wdt.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Florian had another fix for the rc32434_wdt.c driver.

So this update will consist of:

 drivers/watchdog/rc32434_wdt.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

with these Changes:

Author: Florian Fainelli <florian@...nwrt.org>
Date:   Wed Dec 2 13:21:23 2009 +0100

    [PATCH] rc32434_wdt: fix compilation failure
    
    This patch fixes the compilation failure of
    rc32434 due to a bad module parameter description.
    
    Signed-off-by: Florian Fainelli <florian@...nwrt.org>
    Signed-off-by: Wim Van Sebroeck <wim@...ana.be>

Author: H Hartley Sweeten <hartleys@...ionengravers.com>
Date:   Tue Nov 24 21:06:26 2009 -0500

    [WATCHDOG] rc32434_wdt.c: use resource_size()
    
    The size value passed to ioremap_nocache() is not correct.
    Use resource_size() to get the correct value.
    
    Signed-off-by: H Hartley Sweeten <hsweeten@...ionengravers.com>
    Cc: Phil Sutter <n0-1@...ewrt.org>
    Signed-off-by: Wim Van Sebroeck <wim@...ana.be>

The Changes can also be looked at on:
	http://www.kernel.org/git/?p=linux/kernel/git/wim/linux-2.6-watchdog.git;a=summary

For completeness, I added the overal diff below.

Greetings,
Wim.

================================================================================
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index f6cccc9..bf12d06 100644
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -62,7 +62,7 @@ extern unsigned int idt_cpu_freq;
 static int timeout = WATCHDOG_TIMEOUT;
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout, "Watchdog timeout value, in seconds (default="
-		WATCHDOG_TIMEOUT ")");
+		__MODULE_STRING(WATCHDOG_TIMEOUT) ")");
 
 static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, int, 0);
@@ -276,7 +276,7 @@ static int __devinit rc32434_wdt_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	wdt_reg = ioremap_nocache(r->start, r->end - r->start);
+	wdt_reg = ioremap_nocache(r->start, resource_size(r));
 	if (!wdt_reg) {
 		printk(KERN_ERR PFX "failed to remap I/O resources\n");
 		return -ENXIO;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/