| From: Emil Goode <emilgoode@gmail.com> |
| Date: Mon, 19 May 2014 15:07:54 +0800 |
| Subject: ARM: imx: fix error handling in ipu device registration |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit d1d70e5dc2cfa9047bb935c41ba808ebb8135696 upstream. |
| |
| If we fail to allocate struct platform_device pdev we |
| dereference it after the goto label err. |
| |
| This bug was found using coccinelle. |
| |
| Fixes: afa77ef (ARM: mx3: dynamically allocate "ipu-core" devices) |
| Signed-off-by: Emil Goode <emilgoode@gmail.com> |
| Acked-by: Uwe Kleine-Kรถnig <u.kleine-koenig@pengutronix.de> |
| Signed-off-by: Shawn Guo <shawn.guo@freescale.com> |
| Signed-off-by: Olof Johansson <olof@lixom.net> |
| [bwh: Backported to 3.2: adjust filename] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/arm/plat-mxc/devices/platform-ipu-core.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/plat-mxc/devices/platform-ipu-core.c b/arch/arm/plat-mxc/devices/platform-ipu-core.c |
| index fc4dd7c..6bd7c3f 100644 |
| --- a/arch/arm/plat-mxc/devices/platform-ipu-core.c |
| +++ b/arch/arm/plat-mxc/devices/platform-ipu-core.c |
| @@ -77,7 +77,7 @@ struct platform_device *__init imx_alloc_mx3_camera( |
| |
| pdev = platform_device_alloc("mx3-camera", 0); |
| if (!pdev) |
| - goto err; |
| + return ERR_PTR(-ENOMEM); |
| |
| pdev->dev.dma_mask = kmalloc(sizeof(*pdev->dev.dma_mask), GFP_KERNEL); |
| if (!pdev->dev.dma_mask) |
