---

yaml --- r: 276321 b: refs/heads/master c: e384a41 h: refs/heads/master i: 276319: 4ee37ee v: v3
git-mirror · Nov 27, 2011 · 7219ec6 · 7219ec6
1 parent 806beee
commit 7219ec6
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: 6a9ce6b654e491981f6ef7e214cbd4f63e033848
+refs/heads/master: e384a41141949843899affcf51f4e6e646c1fe9f
diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c
@@ -670,6 +670,11 @@ static int do_insnlist_ioctl(struct comedi_device *dev,
 		goto error;
 	}
 
+	if (sizeof(struct comedi_insn) * insnlist.n_insns < insnlist.n_insns) {
+		ret = -EINVAL;
+		goto error;
+	}
+
 	insns =
 	    kmalloc(sizeof(struct comedi_insn) * insnlist.n_insns, GFP_KERNEL);
 	if (!insns) {