1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/usb/misc/yurex.c b/drivers/usb/misc/yurex.c
index 3be40eaa1ac9..6d9fd5f64903 100644
--- a/drivers/usb/misc/yurex.c
+++ b/drivers/usb/misc/yurex.c
@@ -413,6 +413,9 @@ static ssize_t yurex_read(struct file *file, char __user *buffer, size_t count,
         spin_unlock_irqrestore(&dev->lock, flags);
         mutex_unlock(&dev->io_mutex);
 
+        if (WARN_ON_ONCE(len >= sizeof(in_buffer)))
+                return -EIO;
+
         return simple_read_from_buffer(buffer, count, ppos, in_buffer, len);
 }
 
@@ -421,13 +424,13 @@ static ssize_t yurex_write(struct file *file, const char __user *user_buffer,
 {
         struct usb_yurex *dev;
         int i, set = 0, retval = 0;
-        char buffer[16];
+        char buffer[16 + 1];
         char *data = buffer;
         unsigned long long c, c2 = 0;
         signed long timeout = 0;
         DEFINE_WAIT(wait);
 
-        count = min(sizeof(buffer), count);
+        count = min(sizeof(buffer) - 1, count);
         dev = file->private_data;
 
         /* verify that we actually have some data to write */
@@ -446,6 +449,7 @@ static ssize_t yurex_write(struct file *file, const char __user *user_buffer,
                 retval = -EFAULT;
                 goto error;
         }
+        buffer[count] = 0;
         memset(dev->cntl_buffer, CMD_PADDING, YUREX_BUF_SIZE);
 
         switch (buffer[0]) {