tracing: Truncated output is better than nothing

[linux-drm-fsl-dcu.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 3ce3c4ccfc9413a67697226d4e16de2be26331a2..4ceb2546c7efb98d2509a79e92816bb8f7282ef7 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2158,9 +2158,7 @@ __trace_array_vprintk(struct ring_buffer *buffer,
                goto out;
        }
 
-       len = vsnprintf(tbuffer, TRACE_BUF_SIZE, fmt, args);
-       if (len > TRACE_BUF_SIZE)
-               goto out;
+       len = vscnprintf(tbuffer, TRACE_BUF_SIZE, fmt, args);
 
        local_save_flags(flags);
        size = sizeof(*entry) + len + 1;
@@ -2171,8 +2169,7 @@ __trace_array_vprintk(struct ring_buffer *buffer,
        entry = ring_buffer_event_data(event);
        entry->ip = ip;
 
-       memcpy(&entry->buf, tbuffer, len);
-       entry->buf[len] = '\0';
+       memcpy(&entry->buf, tbuffer, len + 1);
        if (!call_filter_check_discard(call, entry, buffer, event)) {
                __buffer_unlock_commit(buffer, event);
                ftrace_trace_stack(buffer, flags, 6, pc);