From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755494AbZIVIkO (ORCPT ); Tue, 22 Sep 2009 04:40:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753957AbZIVIkL (ORCPT ); Tue, 22 Sep 2009 04:40:11 -0400 Received: from hera.kernel.org ([140.211.167.34]:42198 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752621AbZIVIkK (ORCPT ); Tue, 22 Sep 2009 04:40:10 -0400 Date: Tue, 22 Sep 2009 08:39:36 GMT From: tip-bot for Li Zefan Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, lizf@cn.fujitsu.com, jolsa@redhat.com, fweisbec@gmail.com, rostedt@goodmis.org, tglx@linutronix.de, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, lizf@cn.fujitsu.com, jolsa@redhat.com, fweisbec@gmail.com, rostedt@goodmis.org, tglx@linutronix.de, mingo@elte.hu In-Reply-To: <4AB865FA.5080801@cn.fujitsu.com> References: <4AB865FA.5080801@cn.fujitsu.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:tracing/urgent] tracing: Fix off-by-one in trace_get_user() Message-ID: Git-Commit-ID: 3c235a337e205da0f614e456be72881483dcde6e X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Tue, 22 Sep 2009 08:39:37 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 3c235a337e205da0f614e456be72881483dcde6e Gitweb: http://git.kernel.org/tip/3c235a337e205da0f614e456be72881483dcde6e Author: Li Zefan AuthorDate: Tue, 22 Sep 2009 13:51:54 +0800 Committer: Ingo Molnar CommitDate: Tue, 22 Sep 2009 10:28:53 +0200 tracing: Fix off-by-one in trace_get_user() Leave the last slot for the tailing '\0'. Signed-off-by: Li Zefan Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Steven Rostedt LKML-Reference: <4AB865FA.5080801@cn.fujitsu.com> Signed-off-by: Ingo Molnar --- 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 a35925d..ae17453 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -415,7 +415,7 @@ int trace_get_user(struct trace_parser *parser, const char __user *ubuf, /* read the non-space input */ while (cnt && !isspace(ch)) { - if (parser->idx < parser->size) + if (parser->idx < parser->size - 1) parser->buffer[parser->idx++] = ch; else { ret = -EINVAL;