---

yaml --- r: 218356 b: refs/heads/master c: 8f895da h: refs/heads/master v: v3
git-mirror · Oct 27, 2010 · bae1196 · bae1196
1 parent e03c1c0
commit bae1196
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 881fe6c1d06bf49f4ab7aef212cdaf66bd059614
+refs/heads/master: 8f895da57da80b307efa2f94b5d4caf801e959a5
diff --git a/trunk/drivers/gpu/drm/radeon/r600_cs.c b/trunk/drivers/gpu/drm/radeon/r600_cs.c
@@ -215,6 +215,9 @@ static inline int r600_cs_track_validate_cb(struct radeon_cs_parser *p, int i)
 				 __func__, __LINE__, pitch);
 			return -EINVAL;
 		}
+		/* avoid breaking userspace */
+		if (height > 7)
+			height &= ~0x7;
 		if (!IS_ALIGNED(height, 8)) {
 			dev_warn(p->dev, "%s:%d cb height (%d) invalid\n",
 				 __func__, __LINE__, height);