drm/msm: fix potential NULL pointer dereference

Wei Yongjun · robclark · commit aea6a64c3872 · 2013-09-12T10:32:12.000-04:00
The dereference to 'pdata' should be moved below the NULL test.

Signed-off-by: Wei Yongjun &lt;yongjun_wei@trendmicro.com.cn&gt;
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
@@ -29,13 +29,14 @@
 static void bs_init(struct msm_gpu *gpu, struct platform_device *pdev)
 {
 	struct drm_device *dev = gpu->dev;
-	struct kgsl_device_platform_data *pdata = pdev->dev.platform_data;
+	struct kgsl_device_platform_data *pdata;
 
 	if (!pdev) {
 		dev_err(dev->dev, "could not find dtv pdata\n");
 		return;
 	}
 
+	pdata = pdev->dev.platform_data;
 	if (pdata->bus_scale_table) {
 		gpu->bsc = msm_bus_scale_register_client(pdata->bus_scale_table);
 		DBG("bus scale client: %08x", gpu->bsc);

Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,14 @@`
`29`	`29`	`static void bs_init(struct msm_gpu gpu, struct platform_device pdev)`
`30`	`30`	`{`
`31`	`31`	`struct drm_device *dev = gpu->dev;`
`32`		`- struct kgsl_device_platform_data *pdata = pdev->dev.platform_data;`
	`32`	`+ struct kgsl_device_platform_data *pdata;`
`33`	`33`
`34`	`34`	`if (!pdev) {`
`35`	`35`	`dev_err(dev->dev, "could not find dtv pdata\n");`
`36`	`36`	`return;`
`37`	`37`	`}`
`38`	`38`
	`39`	`+ pdata = pdev->dev.platform_data;`
`39`	`40`	`if (pdata->bus_scale_table) {`
`40`	`41`	`gpu->bsc = msm_bus_scale_register_client(pdata->bus_scale_table);`
`41`	`42`	`DBG("bus scale client: %08x", gpu->bsc);`