diff --git a/[refs] b/[refs]
index 339d366b06c1..e0454393c3fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7518b9b8fc72a6c0ba67f33bdd4689c7dd28686a
+refs/heads/master: 5ac5bd8754b3dabcf4aea7b5f4a28a1d8494a1b0
diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c
index 6f8a75dc1ef0..1905a83b3385 100644
--- a/trunk/drivers/staging/bcm/Bcmchar.c
+++ b/trunk/drivers/staging/bcm/Bcmchar.c
@@ -687,7 +687,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
 			return -EFAULT;
 
-		/* FIXME: don't accept any length from user */
+		if (IoBuffer.InputLength < sizeof(struct link_request))
+			return -EINVAL;
+
 		pvBuffer = kmalloc(IoBuffer.InputLength, GFP_KERNEL);
 		if (!pvBuffer)
 			return -ENOMEM;