diff options
| author | Chen Gang <gang.chen@asianux.com> | 2013-04-08 11:48:27 +0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-04-08 13:26:55 +0200 |
| commit | c97847d2f0eb77c806e650e04d9bbcf79fa05730 (patch) | |
| tree | b55f1ce399ed36116f5a39f735afc4693c85a9d6 | |
| parent | dd9c086d9f507d02d5ba4d7c5eef4bb9518088b8 (diff) | |
| download | linux-c97847d2f0eb77c806e650e04d9bbcf79fa05730.tar.gz linux-c97847d2f0eb77c806e650e04d9bbcf79fa05730.tar.bz2 linux-c97847d2f0eb77c806e650e04d9bbcf79fa05730.zip | |
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>
| -rw-r--r-- | kernel/events/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 59412d037eed..7f0d67ea3f48 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; } |