From: Mark Salyzyn <salyzyn@android.com>
To: linux-kernel@vger.kernel.org
Cc: Nick Desaulniers <ndesaulniers@google.com>,
Mark Salyzyn <salyzyn@android.com>,
Steven Rostedt <rostedt@goodmis.org>,
Ingo Molnar <mingo@redhat.com>,
kernel-team@android.com, stable@vger.kernel.org
Subject: [PATCH] tracing: do not leak kernel addresses
Date: Wed, 25 Jul 2018 13:22:36 -0700 [thread overview]
Message-ID: <20180725202238.165314-1-salyzyn@android.com> (raw)
From: Nick Desaulniers <ndesaulniers@google.com>
Switch from 0x%lx to 0x%pK to print the kernel addresses.
Fixes: CVE-2017-0630
Signed-off-by: Mark Salyzyn <salyzyn@android.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: <kernel-team@android.com>
Cc: <stable@vger.kernel.org> # 3.18, 4.4, 4.9, 4.14
Cc: <linux-kernel@vger.kernel.org>
---
kernel/trace/trace_printk.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c
index ad1d6164e946..93698023baf1 100644
--- a/kernel/trace/trace_printk.c
+++ b/kernel/trace/trace_printk.c
@@ -304,7 +304,7 @@ static int t_show(struct seq_file *m, void *v)
if (!*fmt)
return 0;
- seq_printf(m, "0x%lx : \"", *(unsigned long *)fmt);
+ seq_printf(m, "0x%pK : \"", *(unsigned long *)fmt);
/*
* Tabs and new lines need to be converted.
--
2.18.0.233.g985f88cf7e-goog
next reply other threads:[~2018-07-25 20:23 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-25 20:22 Mark Salyzyn [this message]
2018-07-25 21:14 ` [PATCH] tracing: do not leak kernel addresses Nick Desaulniers
2018-07-26 1:07 ` Steven Rostedt
2018-07-26 15:14 ` Mark Salyzyn
2018-07-26 15:22 ` Steven Rostedt
2018-07-26 16:32 ` Nick Desaulniers
2018-07-26 16:37 ` Steven Rostedt
2018-07-26 16:59 ` Nick Desaulniers
2018-07-26 21:56 ` Nick Desaulniers
2018-07-26 15:31 ` Greg KH
2018-07-26 16:52 ` Nick Desaulniers
2018-07-26 22:15 ` Steven Rostedt
2018-07-27 12:07 ` Jordan Glover
2018-07-27 13:40 ` Jann Horn
2018-07-27 13:47 ` Steven Rostedt
2018-07-27 18:13 ` Nick Desaulniers
2018-07-27 18:31 ` Steven Rostedt
[not found] ` <CAMx4XWv3OazvURuN1XU2+5C5tNDzPuTniMn_T=XTA4P8_uwS_A@mail.gmail.com>
2018-07-27 18:47 ` Jann Horn
2018-07-27 18:58 ` Jann Horn
2018-07-27 19:54 ` Theodore Y. Ts'o
2018-07-27 20:11 ` Steven Rostedt
2018-07-27 20:21 ` Theodore Y. Ts'o
2018-07-27 20:53 ` Steven Rostedt
2018-07-27 22:05 ` Sandeep Patil
2018-07-28 0:04 ` Theodore Y. Ts'o
2018-07-30 14:35 ` Sandeep Patil
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=20180725202238.165314-1-salyzyn@android.com \
--to=salyzyn@android.com \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=ndesaulniers@google.com \
--cc=rostedt@goodmis.org \
--cc=stable@vger.kernel.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).