From: Thomas Gleixner <tglx@linutronix.de>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Kees Cook <keescook@chromium.org>,
LKML <linux-kernel@vger.kernel.org>,
x86@kernel.org, Masami Hiramatsu <mhiramat@kernel.org>,
"Luis R. Rodriguez" <mcgrof@kernel.org>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: [PATCH] x86/ftrace: Make sure that ftrace trampolines are not RWX
Date: Thu, 25 May 2017 08:25:32 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.20.1705250813190.2329@nanos> (raw)
In-Reply-To: <20170524182547.5c085dc7@vmware.local.home>
On Wed, 24 May 2017, Steven Rostedt wrote:
> The trampolines uses the module allocation, and it appears, that needs
> to become rw before freeing again.
Indeed. I realized that when enabling more debug options, which led to a
reliable triple fault.
How intuitive.
> I applied this patch, and it appears to fix the bug for me.
It fixes the bug, but ...
> -static inline void tramp_free(void *tramp)
> +static inline void tramp_free(void *tramp, int size)
> {
> + int npages;
> +
> + npages = PAGE_ALIGN(size) >> PAGE_SHIFT;
For correctness sake this wants
set_memory_nx(...);
as well.
> + set_memory_rw((unsigned long)tramp, npages);
> module_memfree(tramp);
> }
I'll clean that up and post a V2.
Thanks,
tglx
next prev parent reply other threads:[~2017-05-25 6:25 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-24 13:47 [PATCH] x86/ftrace: Make sure that ftrace trampolines are not RWX Thomas Gleixner
2017-05-24 14:33 ` Masami Hiramatsu
2017-05-24 15:04 ` Steven Rostedt
2017-05-24 17:47 ` Steven Rostedt
2017-05-24 18:16 ` Luis R. Rodriguez
2017-05-24 18:53 ` Thomas Gleixner
2017-05-24 19:34 ` Luis R. Rodriguez
2017-05-24 19:13 ` Thomas Gleixner
2017-05-24 22:25 ` Steven Rostedt
2017-05-24 23:18 ` Luis R. Rodriguez
2017-05-25 6:25 ` Thomas Gleixner [this message]
2017-05-25 8:57 ` [PATCH V2] " Thomas Gleixner
2017-05-25 15:15 ` Steven Rostedt
2017-05-25 17:46 ` Luis R. Rodriguez
2017-05-25 19:51 ` Kees Cook
2017-05-26 7:03 ` Thomas Gleixner
2017-05-26 9:27 ` Heiko Carstens
2017-05-26 9:56 ` Thomas Gleixner
2017-05-26 11:40 ` Michael Ellerman
2017-05-26 9:49 ` Masami Hiramatsu
2017-05-26 13:37 ` Steven Rostedt
2017-05-26 13:50 ` Thomas Gleixner
2017-05-26 13:58 ` Steven Rostedt
2017-05-25 9:09 ` [PATCH] " Masami Hiramatsu
2017-05-25 10:34 ` Masami Hiramatsu
2017-05-25 15:18 ` Steven Rostedt
2017-05-26 1:34 ` Masami Hiramatsu
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=alpine.DEB.2.20.1705250813190.2329@nanos \
--to=tglx@linutronix.de \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=mhiramat@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=x86@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