Commit bbcd18d1 authored Dec 21, 2009 by Baruch Siach Committed by Greg Kroah-Hartman Mar 02, 2010

serial: imx: fix NULL dereference Oops when pdata == NULL



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@tkos.co.il>
Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Oskar Schirmer <os@emlix.com>
Cc: Fabian Godehardt <fg@emlix.com>
Cc: Daniel Glöckner <dg@emlix.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent ac6ec5b1

drivers/serial/imx.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1279,7 +1279,7 @@ static int serial_imx_probe(struct platform_device *pdev)
		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 platform_device *pdev)

		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 platform_device *pdev)

		clk_disable(sport->clk);

		if (pdata->exit)
		if (pdata && pdata->exit)
		pdata->exit(pdev);

		iounmap(sport->port.membase);

Admin message