memory: ti-aemif: fix a potential NULL-pointer dereference

brgl · olofj · commit 6b45a2b1c0bc · 2018-09-06T10:04:07.000-07:00
Platform data pointer may be NULL. We check it everywhere but in one place. Fix it. Fixes: 8af70cd ("memory: aemif: add support for board files") Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Cc: stable@vger.kernel.org Signed-off-by: Olof Johansson <olof@lixom.net>
diff --git a/drivers/memory/ti-aemif.c b/drivers/memory/ti-aemif.c
@@ -411,7 +411,7 @@ static int aemif_probe(struct platform_device *pdev)
 			if (ret < 0)
 				goto error;
 		}
-	} else {
+	} else if (pdata) {
 		for (i = 0; i < pdata->num_sub_devices; i++) {
 			pdata->sub_devices[i].dev.parent = dev;
 			ret = platform_device_register(&pdata->sub_devices[i]);

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ static int aemif_probe(struct platform_device *pdev)`
`411`	`411`	`if (ret < 0)`
`412`	`412`	`goto error;`
`413`	`413`	`}`
`414`		`- } else {`
	`414`	`+ } else if (pdata) {`
`415`	`415`	`for (i = 0; i < pdata->num_sub_devices; i++) {`
`416`	`416`	`pdata->sub_devices[i].dev.parent = dev;`
`417`	`417`	`ret = platform_device_register(&pdata->sub_devices[i]);`