Messages in this thread Patch in this message | | | Date | Mon, 8 Apr 2013 08:29:24 -0700 | From | tip-bot for Chen Gang <> | Subject | [tip:perf/urgent] perf: Fix strncpy() use, always make sure it' s NUL terminated |
| |
Commit-ID: c97847d2f0eb77c806e650e04d9bbcf79fa05730 Gitweb: http://git.kernel.org/tip/c97847d2f0eb77c806e650e04d9bbcf79fa05730 Author: Chen Gang <gang.chen@asianux.com> AuthorDate: Mon, 8 Apr 2013 11:48:27 +0800 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Mon, 8 Apr 2013 13:26:55 +0200
perf: Fix strncpy() use, always make sure it's NUL terminated
For NUL terminated string, always make sure that there's '\0' at the end.
In our case we need a return value, so still use strncpy() and fix up the tail explicitly.
(strlcpy() returns the size, not the pointer)
Signed-off-by: Chen Gang <gang.chen@asianux.com> Cc: a.p.zijlstra@chello.nl <a.p.zijlstra@chello.nl> Cc: paulus@samba.org <paulus@samba.org> Cc: acme@ghostprotocols.net <acme@ghostprotocols.net> Link: http://lkml.kernel.org/r/51623E0B.7070101@asianux.com Signed-off-by: Ingo Molnar <mingo@kernel.org> --- kernel/events/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c index 59412d0..7f0d67e 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -4737,7 +4737,8 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event) } else { if (arch_vma_name(mmap_event->vma)) { name = strncpy(tmp, arch_vma_name(mmap_event->vma), - sizeof(tmp)); + sizeof(tmp) - 1); + tmp[sizeof(tmp) - 1] = '\0'; goto got_name; }
| |