diff --git a/[refs] b/[refs]
index 37c946fb5e0a..0add678d78c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5093ebad5f2348076fdc3dac7d2358b1ad7f85f7
+refs/heads/master: 96b02d78a7e47cd189f6b307c5513fec6b2155dc
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index aba822722300..b26cb03c1914 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -3391,7 +3391,7 @@ static void perf_event_comm_event(struct perf_comm_event *comm_event)
 	char comm[TASK_COMM_LEN];
 
 	memset(comm, 0, sizeof(comm));
-	strncpy(comm, comm_event->task->comm, sizeof(comm));
+	strlcpy(comm, comm_event->task->comm, sizeof(comm));
 	size = ALIGN(strlen(comm)+1, sizeof(u64));
 
 	comm_event->comm = comm;