[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-24a461d537f49f9da6533d83100999ea08c6c755@git.kernel.org>
Date: Fri, 23 Jul 2010 12:11:58 GMT
From: tip-bot for Dan Carpenter <error27@...il.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
rostedt@...dmis.org, error27@...il.com, tglx@...utronix.de
Subject: [tip:perf/core] trace: strlen() return doesn't account for the NULL
Commit-ID: 24a461d537f49f9da6533d83100999ea08c6c755
Gitweb: http://git.kernel.org/tip/24a461d537f49f9da6533d83100999ea08c6c755
Author: Dan Carpenter <error27@...il.com>
AuthorDate: Sat, 10 Jul 2010 12:06:44 +0200
Committer: Steven Rostedt <rostedt@...dmis.org>
CommitDate: Thu, 22 Jul 2010 14:56:41 -0400
trace: strlen() return doesn't account for the NULL
We need to add one to the strlen() return because of the NULL
character. The type->name here generally comes from the kernel and I
don't think any of them come close to being MAX_TRACER_SIZE (100)
characters long so this is basically a cleanup.
Signed-off-by: Dan Carpenter <error27@...il.com>
LKML-Reference: <20100710100644.GV19184@...ker>
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
---
kernel/trace/trace.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index f7488f4..cacb6f0 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -739,7 +739,7 @@ __acquires(kernel_lock)
return -1;
}
- if (strlen(type->name) > MAX_TRACER_SIZE) {
+ if (strlen(type->name) >= MAX_TRACER_SIZE) {
pr_info("Tracer has a name longer than %d\n", MAX_TRACER_SIZE);
return -1;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists