Skip to contentSkip to conversation

Patch "tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline()" has been added to the 3.18-stable tree

PATCH [email protected] 1 participant 1 message Jun 12, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

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

to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch
and it can be found in the queue-3.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From e09e28671cda63e6308b31798b997639120e2a21 Mon Sep 17 00:00:00 2001

From: Amey Telawane <[email protected]>
Date: Wed, 3 May 2017 15:41:14 +0530
Subject: tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline()

From: Amey Telawane <[email protected]>

commit e09e28671cda63e6308b31798b997639120e2a21 upstream.

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().

[AmitP: Cherry-picked this commit from CodeAurora kernel/msm-3.10
https://source.codeaurora.org/quic/la/kernel/msm-3.10/commit/?id=2161ae9a70b12cf18ac8e5952a20161ffbccb477]

[ Updated change log and removed the "- 1" from len parameter ]
---
 kernel/trace/trace.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/trace.c +1 -1
@@ -1544,7 +1544,7 @@ static void __trace_find_cmdline(int pid
 
 	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, "<...>");
 }

Patches currently in stable-queue which might be from [email protected] are

queue-3.18/tracing-use-strlcpy-instead-of-strcpy-in-__trace_find_cmdline.patch