---

yaml --- r: 281043 b: refs/heads/master c: 51935d2 h: refs/heads/master i: 281041: 963d504 281039: 3df6b0f v: v3
git-mirror · Nov 27, 2011 · e44a0a7 · e44a0a7
1 parent 1317d04
commit e44a0a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41c7b7c0fa2f68afb1154e88597ff6b9b97334cf
+refs/heads/master: 51935d2259a476162bbf5c35ff81f3a01057ed6f
diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c
@@ -306,7 +306,11 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		if (copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
 			return -EFAULT;
 
-		/* FIXME: don't trust user supplied length */
+		if (IoBuffer.OutputLength > USHRT_MAX ||
+			IoBuffer.OutputLength == 0) {
+			return -EINVAL;
+		}
+
 		temp_buff = kmalloc(IoBuffer.OutputLength, GFP_KERNEL);
 		if (!temp_buff)
 			return STATUS_FAILURE;