linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Catalin Marinas <catalin.marinas@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>,
	Will Deacon <will.deacon@arm.com>,
	Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the userns tree with the arm64 tree
Date: Fri, 28 Sep 2018 09:22:15 +0100	[thread overview]
Message-ID: <20180928082215.GA193149@arrakis.emea.arm.com> (raw)
In-Reply-To: <20180928134929.73598ec6@canb.auug.org.au>

On Fri, Sep 28, 2018 at 01:49:29PM +1000, Stephen Rothwell wrote:
> diff --cc arch/arm64/kernel/traps.c
> index 21689c6a985f,856b32aa03d8..000000000000
> --- a/arch/arm64/kernel/traps.c
> +++ b/arch/arm64/kernel/traps.c
> @@@ -353,12 -366,6 +368,9 @@@ void force_signal_inject(int signal, in
>   	const char *desc;
>   	struct pt_regs *regs = current_pt_regs();
>   
>  +	if (WARN_ON(!user_mode(regs)))
>  +		return;
>  +
> - 	clear_siginfo(&info);
> - 
>   	switch (signal) {
>   	case SIGILL:
>   		desc = "undefined instruction";

It looks fine. Thanks Stephen.

-- 
Catalin

      reply	other threads:[~2018-09-28  8:22 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-28  3:49 linux-next: manual merge of the userns tree with the arm64 tree Stephen Rothwell
2018-09-28  8:22 ` Catalin Marinas [this message]

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=20180928082215.GA193149@arrakis.emea.arm.com \
    --to=catalin.marinas@arm.com \
    --cc=ebiederm@xmission.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=will.deacon@arm.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;
as well as URLs for NNTP newsgroup(s).