From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
stable@vger.kernel.org, Masami Hiramatsu <mhiramat@kernel.org>,
Kees Cook <keescook@chromium.org>,
Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Subject: [PATCH 3/5] trace_uprobe: Use %lx to display offset
Date: Wed, 11 Apr 2018 21:54:02 -0400 [thread overview]
Message-ID: <20180412015440.763923904@goodmis.org> (raw)
In-Reply-To: 20180412015359.244491749@goodmis.org
[-- Attachment #1: 0003-trace_uprobe-Use-lx-to-display-offset.patch --]
[-- Type: text/plain, Size: 1157 bytes --]
From: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
tu->offset is unsigned long, not a pointer, thus %lx should
be used to print it, not the %px.
Link: http://lkml.kernel.org/r/20180315082756.9050-1-ravi.bangoria@linux.vnet.ibm.com
Cc: stable@vger.kernel.org
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Fixes: 0e4d819d0893 ("trace_uprobe: Display correct offset in uprobe_events")
Suggested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
kernel/trace/trace_uprobe.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 8b86d76c55ee..d7d3c9237f64 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -608,7 +608,7 @@ static int probes_seq_show(struct seq_file *m, void *v)
/* Don't print "0x (null)" when offset is 0 */
if (tu->offset) {
- seq_printf(m, "0x%px", (void *)tu->offset);
+ seq_printf(m, "0x%0*lx", (int)(sizeof(void *) * 2), tu->offset);
} else {
switch (sizeof(void *)) {
case 4:
--
2.16.3
next prev parent reply other threads:[~2018-04-12 1:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-12 1:53 [PATCH 0/5] [GIT PULL] tracing: A few last minute clean up and fixes Steven Rostedt
2018-04-12 1:54 ` [PATCH 2/5] tracing/uprobe: Add support for overlayfs Steven Rostedt
2018-04-12 1:54 ` Steven Rostedt [this message]
2018-04-12 1:54 ` [PATCH 4/5] trace_uprobe: Simplify probes_seq_show() Steven Rostedt
2018-04-12 1:54 ` [PATCH 5/5] tracing: Enforce passing in filter=NULL to create_filter() Steven Rostedt
2018-04-12 17:53 ` [PATCH 0/5] [GIT PULL] tracing: A few last minute clean up and fixes Linus Torvalds
2018-04-12 17:58 ` Linus Torvalds
2018-04-12 18:28 ` Steven Rostedt
2018-04-12 19:00 ` Konstantin Ryabitsev
2018-04-12 19:46 ` Steven Rostedt
2018-04-12 19:55 ` Konstantin Ryabitsev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180412015440.763923904@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=ravi.bangoria@linux.vnet.ibm.com \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).