1 files changed, 3 insertions, 2 deletions

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 947c5b3f90c4..a400b861fad3 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -327,10 +327,10 @@ static ssize_t blk_msg_write(struct file *filp, const char __user *buffer,
         char *msg;
         struct blk_trace *bt;
 
-        if (count > BLK_TN_MAX_MSG)
+        if (count > BLK_TN_MAX_MSG - 1)
                 return -EINVAL;
 
-        msg = kmalloc(count, GFP_KERNEL);
+        msg = kmalloc(count + 1, GFP_KERNEL);
         if (msg == NULL)
                 return -ENOMEM;
 
@@ -339,6 +339,7 @@ static ssize_t blk_msg_write(struct file *filp, const char __user *buffer,
                 return -EFAULT;
         }
 
+        msg[count] = '\0';
         bt = filp->private_data;
         __trace_note_message(bt, "%s", msg);
         kfree(msg);