tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline()

Amey Telawane · rostedt · commit e09e28671cda · 2017-05-03T22:15:11.000-04:00
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>
diff --git 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, "<...>");
 }

Original file line number	Diff line number	Diff line change
`@@ -1976,7 +1976,7 @@ static void __trace_find_cmdline(int pid, char comm[])`
`1976`	`1976`
`1977`	`1977`	`map = savedcmd->map_pid_to_cmdline[pid];`
`1978`	`1978`	`if (map != NO_CMDLINE_MAP)`
`1979`		`- strcpy(comm, get_saved_cmdlines(map));`
	`1979`	`+ strlcpy(comm, get_saved_cmdlines(map), TASK_COMM_LEN);`
`1980`	`1980`	`else`
`1981`	`1981`	`strcpy(comm, "<...>");`
`1982`	`1982`	`}`