[PATCH] drm/fb-helper: Do the mode_set.connectors ZERO_SIZE_PTR check

Xiubo Li Li.Xiubo at freescale.com
Wed Mar 5 22:34:21 PST 2014


Since we cannot make sure the 'max_conn_count' will always be none
zero from the users, and then if max_conn_count equals to zero, the
kcalloc() will return ZERO_SIZE_PTR, which equals to ((void *)16).

So this patch fix this via doing the zero pionter check of it.

Signed-off-by: Xiubo Li <Li.Xiubo at freescale.com>
---
 drivers/gpu/drm/drm_fb_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 3d13ca6e2..c6680ef 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -536,7 +536,7 @@ int drm_fb_helper_init(struct drm_device *dev,
 				sizeof(struct drm_connector *),
 				GFP_KERNEL);
 
-		if (!fb_helper->crtc_info[i].mode_set.connectors)
+		if (ZERO_OR_NULL_PTR(fb_helper->crtc_info[i].mode_set.connectors))
 			goto out_free;
 		fb_helper->crtc_info[i].mode_set.num_connectors = 0;
 	}
-- 
1.8.4




More information about the dri-devel mailing list