From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752834AbdBGDNt (ORCPT ); Mon, 6 Feb 2017 22:13:49 -0500 Received: from mail.kernel.org ([198.145.29.136]:48164 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751805AbdBGDNs (ORCPT ); Mon, 6 Feb 2017 22:13:48 -0500 From: Masami Hiramatsu To: Ingo Molnar Cc: Masami Hiramatsu , linux-kernel@vger.kernel.org, Peter Zijlstra , Ananth N Mavinakayanahalli , Thomas Gleixner , "H . Peter Anvin" , Steven Rostedt , Ravi Bangoria Subject: [PATCH tip/master] tracing/probes: Fix a warning message to show correct maximum length Date: Tue, 7 Feb 2017 12:12:49 +0900 Message-Id: <148643715974.9770.191313097974521280.stgit@devbox> X-Mailer: git-send-email 2.9.3 User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since tracing/*probe_events will accept a probe definition up to 4096 - 2 ('\n' and '\0') bytes, it must show 4094 instead of 4096 in warning message. Signed-off-by: Masami Hiramatsu --- kernel/trace/trace_probe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 8c0553d..7138fea 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -673,8 +673,9 @@ ssize_t traceprobe_probes_write(struct file *file, const char __user *buffer, *tmp = '\0'; size = tmp - kbuf + 1; } else if (done + size < count) { + /* This can accept WRITE_BUFSIZE - 2 ('\n' + '\0') */ pr_warn("Line length is too long: Should be less than %d\n", - WRITE_BUFSIZE); + WRITE_BUFSIZE - 2); ret = -EINVAL; goto out; }