From 5626f6a76d480f110b63ba1f1de0e15d229139b8 Mon Sep 17 00:00:00 2001 From: Steve Holland Date: Thu, 18 Jun 2009 17:37:49 -0500 Subject: [PATCH] --- yaml --- r: 165010 b: refs/heads/master c: 92d07e422df3cc5370d0d9b95a671abb69d50ef1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/class/usbtmc.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4abb93e23e3a..b2afd5f32107 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2cd26e15b84b964c489f2aff278cdaf03840c93 +refs/heads/master: 92d07e422df3cc5370d0d9b95a671abb69d50ef1 diff --git a/trunk/drivers/usb/class/usbtmc.c b/trunk/drivers/usb/class/usbtmc.c index f2fde7cd6109..91d3a94eeaa0 100644 --- a/trunk/drivers/usb/class/usbtmc.c +++ b/trunk/drivers/usb/class/usbtmc.c @@ -473,6 +473,10 @@ static ssize_t usbtmc_read(struct file *filp, char __user *buf, n_characters = this_part; } + /* Bound amount of data received by amount of data requested */ + if (n_characters > this_part) + n_characters = this_part; + /* Copy buffer to user space */ if (copy_to_user(buf + done, &buffer[12], n_characters)) { /* There must have been an addressing problem */