diff options
| author | Masami Hiramatsu <mhiramat@kernel.org> | 2018-04-10 21:20:08 +0900 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@microsoft.com> | 2018-05-22 21:36:40 -0400 |
| commit | 204663f60b89317b732cb4368084a0d6975d6060 (patch) | |
| tree | 35d90050c0e75774024750d4fc08ebcf795abe2e | |
| parent | 6fd6f19ff8d7e5c988028c5cbe0bb0fc421511a8 (diff) | |
tracing/uprobe_event: Fix strncpy corner case
[ Upstream commit 50268a3d266ecfdd6c5873d62b2758d9732fc598 ]
Fix string fetch function to terminate with NUL.
It is OK to drop the rest of string.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <songliubraving@fb.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: security@kernel.org
Cc: 范龙飞 <long7573@126.com>
Fixes: 5baaa59ef09e ("tracing/probes: Implement 'memory' fetch method for uprobes")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
| -rw-r--r-- | kernel/trace/trace_uprobe.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 6dd022c7b5bc..1b11c3c21a29 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -149,6 +149,8 @@ static void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs, return; ret = strncpy_from_user(dst, src, maxlen); + if (ret == maxlen) + dst[--ret] = '\0'; if (ret < 0) { /* Failed to fetch string */ ((u8 *)get_rloc_data(dest))[0] = '\0'; |