Message ID | 1494410019-13457-1-git-send-email-po-hsu.lin@canonical.com |
---|---|
State | New |
Headers | show |
On Wed, May 10, 2017 at 05:53:36PM +0800, Po-Hsu Lin wrote: > From: Amey Telawane <ameyt@codeaurora.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@codeaurora.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@linaro.org> > [ Updated change log and removed the "- 1" from len parameter ] > Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> > > (backported from commit e09e28671cda63e6308b31798b997639120e2a21) > CVE-2017-0605 > > Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com> Applied to artful master-next.
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 0ad75e9..fe17169 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1899,7 +1899,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, "<...>"); }