From: Peter Zijlstra <peterz@infradead.org>
To: Oleg Nesterov <oleg@redhat.com>
Cc: Andy Lutomirski <tipbot@zytor.com>,
Ingo Molnar <mingo@kernel.org>, Jiri Olsa <jolsa@redhat.com>,
Pratyush Anand <panand@redhat.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH tip/x86/asm] uprobes: __create_xol_area() must nullify xol_mapping.fault
Date: Mon, 29 Feb 2016 12:42:10 +0100 [thread overview]
Message-ID: <20160229114210.GK6356@twins.programming.kicks-ass.net> (raw)
In-Reply-To: <20160227221128.GA29565@redhat.com>
On Sat, Feb 27, 2016 at 11:11:28PM +0100, Oleg Nesterov wrote:
> As Jiri pointed out, the recent commit f872f5400cc0 "mm: Add a
> vm_special_mapping.fault() method" breaks uprobes. __create_xol_area()
> doesn't initialize the new ->fault() method and this obviously leads to
> kernel crash when the application tries to execute the probed insn after
> bp hit.
>
> We probably want to add uprobes_special_mapping_fault(), this allows to
> turn xol_area->xol_mapping into a single instance of vm_special_mapping.
> But we need a simple fix, so lets change __create_xol() to nullify the
> new member as Jiri suggests.
>
> Reported-by: Jiri Olsa <jolsa@redhat.com>
> Suggested-by: Jiri Olsa <jolsa@redhat.com>
> Signed-off-by: Oleg Nesterov <oleg@redhat.com>
> ---
> kernel/events/uprobes.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
> index 0167679..5f6ce93 100644
> --- a/kernel/events/uprobes.c
> +++ b/kernel/events/uprobes.c
> @@ -1178,6 +1178,7 @@ static struct xol_area *__create_xol_area(unsigned long vaddr)
> goto free_area;
>
> area->xol_mapping.name = "[uprobes]";
> + area->xol_mapping.fault = NULL;
> area->xol_mapping.pages = area->pages;
Would not something like:
area->xol_mapping = (struct vm_special_mapping){
.name = "[uprobes]",
.pages = area->pages,
};
Be a more robust approach? That way, if someone adds more fields, they
at least get initialized (to 0).
> area->pages[0] = alloc_page(GFP_HIGHUSER);
> if (!area->pages[0])
next prev parent reply other threads:[~2016-02-29 11:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-27 22:11 [PATCH tip/x86/asm] uprobes: __create_xol_area() must nullify xol_mapping.fault Oleg Nesterov
2016-02-29 11:02 ` [tip:x86/asm] " tip-bot for Oleg Nesterov
2016-02-29 11:42 ` Peter Zijlstra [this message]
2016-02-29 15:51 ` [PATCH tip/x86/asm] " Oleg Nesterov
2016-02-29 16:14 ` Peter Zijlstra
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=20160229114210.GK6356@twins.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=panand@redhat.com \
--cc=tipbot@zytor.com \
/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