linux-kernel - [PATCH 2/2] rdc321x-wtd: fix null pointer dereference while accessing platform

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>] [day] [month] [year] [list]

Message-Id: <201011261039.55953.florian@openwrt.org>
Date:	Fri, 26 Nov 2010 10:39:55 +0100
From:	Florian Fainelli <florian@...nwrt.org>
To:	sameo@...ux.intel.com
Cc:	linux-kernel@...r.kernel.org, Wim Van Sebroeck <wim@...ana.be>
Subject: [PATCH 2/2] rdc321x-wtd: fix null pointer dereference while accessing platform_data

rdc321x-wdt currently fetches its driver specific data by using the platform_
device->platform_data pointer, this is wrong because the mfd device which
registers our platform_device has been added using mfd_add_device() which sets
the platform_device->driver_data pointer instead.

Signed-off-by: Florian Fainelli <florian@...nwrt.org>
CC: stable@...nel.org
---
This patch should be applied for the next 2.6.36 stable release.

diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
index 428f8a1..3939e53 100644
--- a/drivers/watchdog/rdc321x_wdt.c
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -231,7 +231,7 @@ static int __devinit rdc321x_wdt_probe(struct platform_device *pdev)
 	struct resource *r;
 	struct rdc321x_wdt_pdata *pdata;
 
-	pdata = pdev->dev.platform_data;
+	pdata = platform_get_drvdata(pdev);
 	if (!pdata) {
 		dev_err(&pdev->dev, "no platform data supplied\n");
 		return -ENODEV;

View attachment "e28c923a79c0547fcbaa0bd3d5007c111d9b485f.diff" of type "text/x-patch" (493 bytes)