From: Markos Chandras <Markos.Chandras@imgtec.com>
To: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>,
<linux-mips@linux-mips.org>, <paul.burton@imgtec.com>,
<richard@nod.at>, <linux-kernel@vger.kernel.org>,
<ralf@linux-mips.org>, <luto@amacapital.net>,
<alex.smith@imgtec.com>, <macro@codesourcery.com>,
<mpe@ellerman.id.au>
Subject: Re: [PATCH v3] MIPS64: signal: n64 kernel bugfix of MIPS32 o32 ABI sigaction syscall
Date: Tue, 20 Oct 2015 09:35:42 +0100 [thread overview]
Message-ID: <5625FCDE.9010608@imgtec.com> (raw)
In-Reply-To: <20151019183955.6212.78229.stgit@ubuntu-yegoshin>
On 10/19/2015 07:39 PM, Leonid Yegoshin wrote:
> MIPS32 o32 ABI sigaction() processing on MIPS64 n64 kernel was incorrectly
> set to processing aka rt_sigaction() variant only.
>
> Fixed.
> --
> V3: Signature added.
> v2: Taken in account CONFIG vars interdependencies and conditional expression
> simplified. As a result, the reverse problem fixed (introduced by v1).
> Tested on all 3 ABIs.
> --
>
> Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
> ---
> arch/mips/include/asm/signal.h | 12 +++++++++---
> arch/mips/kernel/signal.c | 2 +-
> 2 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/arch/mips/include/asm/signal.h b/arch/mips/include/asm/signal.h
> index 003e273eff4c..2292373ff11a 100644
> --- a/arch/mips/include/asm/signal.h
> +++ b/arch/mips/include/asm/signal.h
> @@ -11,11 +11,17 @@
>
> #include <uapi/asm/signal.h>
>
> +#ifdef CONFIG_MIPS32_COMPAT
> +extern struct mips_abi mips_abi_32;
>
> -#ifdef CONFIG_TRAD_SIGNALS
> -#define sig_uses_siginfo(ka) ((ka)->sa.sa_flags & SA_SIGINFO)
> +#define sig_uses_siginfo(ka, abi) \
> + ((abi != &mips_abi_32) ? 1 : \
> + ((ka)->sa.sa_flags & SA_SIGINFO))
> #else
> -#define sig_uses_siginfo(ka) (1)
> +#define sig_uses_siginfo(ka, abi) \
> + (config_enabled(CONFIG_64BIT) ? 1 : \
> + (config_enabled(CONFIG_TRAD_SIGNALS) ? \
> + ((ka)->sa.sa_flags & SA_SIGINFO) : 1) )
> #endif
>
> #include <asm/sigcontext.h>
> diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
> index bf792e2839a6..5f18d0b879e0 100644
> --- a/arch/mips/kernel/signal.c
> +++ b/arch/mips/kernel/signal.c
> @@ -798,7 +798,7 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
> regs->regs[0] = 0; /* Don't deal with this again. */
> }
>
> - if (sig_uses_siginfo(&ksig->ka))
> + if (sig_uses_siginfo(&ksig->ka, abi))
> ret = abi->setup_rt_frame(vdso + abi->vdso->off_rt_sigreturn,
> ksig, regs, oldset);
> else
>
>
What tree did you use for this patch? It does not seem to apply to
mainline or Ralf's upstream-sfr.
--
markos
next prev parent reply other threads:[~2015-10-20 8:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-19 18:39 [PATCH v3] MIPS64: signal: n64 kernel bugfix of MIPS32 o32 ABI sigaction syscall Leonid Yegoshin
2015-10-20 8:35 ` Markos Chandras [this message]
2015-10-20 18:12 ` Leonid Yegoshin
2015-10-21 8:04 ` Markos Chandras
-- strict thread matches above, loose matches on Subject: below --
2015-10-20 16:40 Leonid Yegoshin
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=5625FCDE.9010608@imgtec.com \
--to=markos.chandras@imgtec.com \
--cc=Leonid.Yegoshin@imgtec.com \
--cc=alex.smith@imgtec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=luto@amacapital.net \
--cc=macro@codesourcery.com \
--cc=mpe@ellerman.id.au \
--cc=paul.burton@imgtec.com \
--cc=ralf@linux-mips.org \
--cc=richard@nod.at \
/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).