[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20170503100924.5ec219b7@gandalf.local.home>
Date: Wed, 3 May 2017 10:09:24 -0400
From: Steven Rostedt <rostedt@...dmis.org>
To: Amit Pundir <amit.pundir@...aro.org>
Cc: Ingo Molnar <mingo@...hat.com>,
Greg KH <gregkh@...uxfoundation.org>,
lkml <linux-kernel@...r.kernel.org>,
Amey Telawane <ameyt@...eaurora.org>, stable@...r.kernel.org
Subject: [PATCH] tracing: Use strlcpy() instead of strcpy() in
__trace_find_cmdline() (Was: Re: [PATCH] tracing: Resolve stack corruption
due to string copy)
[ Here's the new patch ]
From: Amey Telawane <ameyt@...eaurora.org>
Strcpy is inherently not safe, and strlcpy() should be used instead.
__trace_find_cmdline() uses strcpy() because the comms saved must have a
terminating nul character, but it doesn't hurt to add the extra protection
of using strlcpy() instead of strcpy().
Link: http://lkml.kernel.org/r/1493806274-13936-1-git-send-email-amit.pundir@linaro.org
Signed-off-by: Amey Telawane <ameyt@...eaurora.org>
[AmitP: Cherry-picked this commit from CodeAurora kernel/msm-3.10
https://source.codeaurora.org/quic/la/kernel/msm-3.10/commit/?id=2161ae9a70b12cf18ac8e5952a20161ffbccb477]
Signed-off-by: Amit Pundir <amit.pundir@...aro.org>
[ Updated change log and removed the "- 1" from len parameter ]
Signed-off-by: Steven Rostedt (VMware) <rostedt@...dmis.org>
---
kernel/trace/trace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 5b645b0..c1b0f53 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1976,7 +1976,7 @@ static void __trace_find_cmdline(int pid, char comm[])
map = savedcmd->map_pid_to_cmdline[pid];
if (map != NO_CMDLINE_MAP)
- strcpy(comm, get_saved_cmdlines(map));
+ strlcpy(comm, get_saved_cmdlines(map), TASK_COMM_LEN);
else
strcpy(comm, "<...>");
}
--
2.9.3
Powered by blists - more mailing lists