public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] comedi: integer overflow in do_insnlist_ioctl()
@ 2011-11-23  0:49 Xi Wang
  2011-11-23  6:13 ` Dan Carpenter
  0 siblings, 1 reply; 14+ messages in thread
From: Xi Wang @ 2011-11-23  0:49 UTC (permalink / raw)
  To: linux-kernel
  Cc: Ian Abbott, Mori Hess, Greg Kroah-Hartman, Mark Pearson,
	Lucas De Marchi, Greg Dietsche, Franky Lin, devel, security

There is a potential integer overflow in do_insnlist_ioctl() if userspace passes in a large insnlist.n_insns.  The call to kmalloc() would allocate a small buffer, which would result in a memory corruption.

Reported-by: Haogang Chen <haogangchen@gmail.com>
Signed-off-by: Xi Wang <xi.wang@gmail.com>
---
 drivers/staging/comedi/comedi_fops.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 21d8c1c..66bb49d 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -650,6 +650,7 @@ static int parse_insn(struct comedi_device *dev, struct comedi_insn *insn,
  *		data (for reads)
  */
 /* arbitrary limits */
+#define MAX_INSNS   256
 #define MAX_SAMPLES 256
 static int do_insnlist_ioctl(struct comedi_device *dev,
 			     struct comedi_insnlist __user *arg, void *file)
@@ -663,6 +664,12 @@ static int do_insnlist_ioctl(struct comedi_device *dev,
 	if (copy_from_user(&insnlist, arg, sizeof(struct comedi_insnlist)))
 		return -EFAULT;
 
+	if (insnlist.n_insns > MAX_INSNS) {
+		DPRINTK("invalid number of instructions\n");
+		ret = -EINVAL;
+		goto error;
+	}
+
 	data = kmalloc(sizeof(unsigned int) * MAX_SAMPLES, GFP_KERNEL);
 	if (!data) {
 		DPRINTK("kmalloc failed\n");
-- 
1.7.5.4


^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2011-11-27 21:25 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-23  0:49 [PATCH] comedi: integer overflow in do_insnlist_ioctl() Xi Wang
2011-11-23  6:13 ` Dan Carpenter
2011-11-23 13:59   ` Xi Wang
2011-11-23 14:50     ` Dan Carpenter
2011-11-23 16:06       ` Ian Abbott
2011-11-23 16:53         ` [PATCH v2] " Xi Wang
2011-11-23 21:41         ` [PATCH] " Lars-Peter Clausen
2011-11-23 21:51           ` Dan Carpenter
2011-11-24 19:07             ` Xi Wang
2011-11-25  7:25               ` Dan Carpenter
2011-11-25 21:46                 ` [PATCH v3] " Xi Wang
2011-11-27  2:52                   ` Greg KH
2011-11-27 11:25                     ` Dan Carpenter
2011-11-27 21:24                       ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox