From: Alex Deucher <alexdeucher@gmail.com>
Date: Wed, 21 Jul 2010 00:29:32 +0000 (+1000)
Subject: drm/r600: fix possible NULL pointer derefernce
X-Git-Tag: v2.6.35-rc6~12^2
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;ds=sidebyside;h=c42750b0261274107ae85c894c088e618a3e38b9;p=net-next-2.6.git

drm/r600: fix possible NULL pointer derefernce

Reported-by: Alexander Y. Fomichev <git.user@gmail.com>
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/drivers/gpu/drm/radeon/r600_blit.c b/drivers/gpu/drm/radeon/r600_blit.c
index f4fb88ece2b..ca5c29f7077 100644
--- a/drivers/gpu/drm/radeon/r600_blit.c
+++ b/drivers/gpu/drm/radeon/r600_blit.c
@@ -538,9 +538,12 @@ int
 r600_prepare_blit_copy(struct drm_device *dev, struct drm_file *file_priv)
 {
 	drm_radeon_private_t *dev_priv = dev->dev_private;
+	int ret;
 	DRM_DEBUG("\n");
 
-	r600_nomm_get_vb(dev);
+	ret = r600_nomm_get_vb(dev);
+	if (ret)
+		return ret;
 
 	dev_priv->blit_vb->file_priv = file_priv;