1 files changed, 3 insertions, 9 deletions

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index a990824c8604..2aeb6ffc0a1e 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -349,16 +349,10 @@ static ssize_t blk_msg_write(struct file *filp, const char __user *buffer,
         if (count >= BLK_TN_MAX_MSG)
                 return -EINVAL;
 
-        msg = kmalloc(count + 1, GFP_KERNEL);
-        if (msg == NULL)
-                return -ENOMEM;
-
-        if (copy_from_user(msg, buffer, count)) {
-                kfree(msg);
-                return -EFAULT;
-        }
+        msg = memdup_user_nul(buffer, count);
+        if (IS_ERR(msg))
+                return PTR_ERR(msg);
 
-        msg[count] = '\0';
         bt = filp->private_data;
         __trace_note_message(bt, "%s", msg);
         kfree(msg);