---

yaml --- r: 345307 b: refs/heads/master c: e3cc352 h: refs/heads/master i: 345305: 4433f91 345303: a9a4d79 v: v3
git-mirror · Nov 20, 2012 · dfe2135 · dfe2135
1 parent b3afc61
commit dfe2135
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c9287c6009b37754c42e0ba73a4cc79de92d8f8
+refs/heads/master: e3cc3520dc2f554b9686b8fc5773d8b8bc8e9c9a
diff --git a/trunk/drivers/gpu/drm/drm_crtc.c b/trunk/drivers/gpu/drm/drm_crtc.c
@@ -2331,6 +2331,11 @@ int drm_mode_addfb2(struct drm_device *dev,
 	if (!drm_core_check_feature(dev, DRIVER_MODESET))
 		return -EINVAL;
 
+	if (r->flags & ~DRM_MODE_FB_INTERLACED) {
+		DRM_DEBUG_KMS("bad framebuffer flags 0x%08x\n", r->flags);
+		return -EINVAL;
+	}
+
 	if ((config->min_width > r->width) || (r->width > config->max_width)) {
 		DRM_DEBUG_KMS("bad framebuffer width %d, should be >= %d && <= %d\n",
 			  r->width, config->min_width, config->max_width);