gma500: medfield: fix potential NULL pointer dereference in mdfld_dsi_output_init()

Commit Message

Wei Yongjun Oct. 7, 2012, 1:56 p.m. UTC

From: Wei Yongjun <[e-mail]>

The dereference should be moved below the NULL test.

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <[e-mail]>
---
 drivers/gpu/drm/gma500/mdfld_dsi_output.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Alan Cox Oct. 8, 2012, 12:27 p.m. UTC | #1

On Sun, 7 Oct 2012 21:56:45 +0800
Wei Yongjun <[e-mail]> wrote:

> From: Wei Yongjun <[e-mail]>
> 
> The dereference should be moved below the NULL test.

The !dev check just wants removing I think - it's a bogus check in the
first place.

Patch

diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.c b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
index 32dba2a..f92932f 100644
--- a/drivers/gpu/drm/gma500/mdfld_dsi_output.c
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
@@ -500,17 +500,18 @@  void mdfld_dsi_output_init(struct drm_device *dev,
 	struct mdfld_dsi_connector *dsi_connector;
 	struct drm_connector *connector;
 	struct mdfld_dsi_encoder *encoder;
-	struct drm_psb_private *dev_priv = dev->dev_private;
+	struct drm_psb_private *dev_priv;
 	struct panel_info dsi_panel_info;
 	u32 width_mm, height_mm;
 
-	dev_dbg(dev->dev, "init DSI output on pipe %d\n", pipe);
-
 	if (!dev || ((pipe != 0) && (pipe != 2))) {
 		DRM_ERROR("Invalid parameter\n");
 		return;
 	}
 
+	dev_dbg(dev->dev, "init DSI output on pipe %d\n", pipe);
+	dev_priv = dev->dev_private;
+
 	/*create a new connetor*/
 	dsi_connector = kzalloc(sizeof(struct mdfld_dsi_connector), GFP_KERNEL);
 	if (!dsi_connector) {