[GIT PULL] tracing: Small fixes to the uprobe code

* [GIT PULL] tracing: Small fixes to the uprobe code
@ 2019-02-06 16:43 Steven Rostedt
  2019-02-07  8:10 ` pr-tracker-bot
  0 siblings, 1 reply; 2+ messages in thread
From: Steven Rostedt @ 2019-02-06 16:43 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: LKML, Ingo Molnar, Andrew Morton, Andreas Ziegler, Masami Hiramatsu


Linus,

This has two fixes for uprobe code.

 - Cut and paste fix to have uprobe printks say "uprobe" and not "kprobe"

 - Add terminating '\0' byte when copying of function arguments


Please pull the latest trace-v5.0-rc3 tree, which can be found at:


  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-v5.0-rc3

Tag SHA1: a4b2450f61452093078955c7287aee413188755b
Head SHA1: 0722069a5374b904ec1a67f91249f90e1cfae259


Andreas Ziegler (2):
      tracing: uprobes: Fix typo in pr_fmt string
      tracing/uprobes: Fix output for multiple string arguments

----
 kernel/trace/trace_uprobe.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
---------------------------

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index e335576b9411..9bde07c06362 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -5,7 +5,7 @@
  * Copyright (C) IBM Corporation, 2010-2012
  * Author:	Srikar Dronamraju <srikar@linux.vnet.ibm.com>
  */
-#define pr_fmt(fmt)	"trace_kprobe: " fmt
+#define pr_fmt(fmt)	"trace_uprobe: " fmt
 
 #include <linux/ctype.h>
 #include <linux/module.h>
@@ -160,6 +160,13 @@ fetch_store_string(unsigned long addr, void *dest, void *base)
 	if (ret >= 0) {
 		if (ret == maxlen)
 			dst[ret - 1] = '\0';
+		else
+			/*
+			 * Include the terminating null byte. In this case it
+			 * was copied by strncpy_from_user but not accounted
+			 * for in ret.
+			 */
+			ret++;
 		*(u32 *)dest = make_data_loc(ret, (void *)dst - base);
 	}
 

^ permalink raw reply related	[flat|nested] 2+ messages in thread