[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100313001510.065998205@kvm.kroah.org>
Date: Fri, 12 Mar 2010 16:12:34 -0800
From: Greg KH <gregkh@...e.de>
To: linux-kernel@...r.kernel.org, stable@...nel.org
Cc: stable-review@...nel.org, torvalds@...ux-foundation.org,
akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
Baruch Siach <baruch@...s.co.il>,
Alan Cox <alan@...ux.intel.com>,
Sascha Hauer <s.hauer@...gutronix.de>,
Oskar Schirmer <os@...ix.com>, Fabian Godehardt <fg@...ix.com>,
Daniel Glöckner <dg@...ix.com>
Subject: [patch 056/123] serial: imx: fix NULL dereference Oops when pdata == NULL
2.6.33-stable review patch. If anyone has any objections, please let me know.
-----------------
From: Baruch Siach <baruch@...s.co.il>
commit bbcd18d1b37413d25eaf4580682b1b8e4a09ff5e upstream.
The platform code doesn't have to provide platform data to get sensible
default behaviour from the imx serial driver.
This patch does not handle NULL dereference in the IrDA case, which still
requires a valid platform data pointer (in imx_startup()/imx_shutdown()),
since I don't know whether there is a sensible default behaviour, or
should the operation just fail cleanly.
Signed-off-by: Baruch Siach <baruch@...s.co.il>
Cc: Baruch Siach <baruch@...s.co.il>
Cc: Alan Cox <alan@...ux.intel.com>
Cc: Sascha Hauer <s.hauer@...gutronix.de>
Cc: Oskar Schirmer <os@...ix.com>
Cc: Fabian Godehardt <fg@...ix.com>
Cc: Daniel Glöckner <dg@...ix.com>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
drivers/serial/imx.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -1279,7 +1279,7 @@ static int serial_imx_probe(struct platf
sport->use_irda = 1;
#endif
- if (pdata->init) {
+ if (pdata && pdata->init) {
ret = pdata->init(pdev);
if (ret)
goto clkput;
@@ -1292,7 +1292,7 @@ static int serial_imx_probe(struct platf
return 0;
deinit:
- if (pdata->exit)
+ if (pdata && pdata->exit)
pdata->exit(pdev);
clkput:
clk_put(sport->clk);
@@ -1321,7 +1321,7 @@ static int serial_imx_remove(struct plat
clk_disable(sport->clk);
- if (pdata->exit)
+ if (pdata && pdata->exit)
pdata->exit(pdev);
iounmap(sport->port.membase);
--
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/
Powered by blists - more mailing lists