From: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
To: Markos Chandras <Markos.Chandras@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>
Subject: Re: [PATCH] MIPS64: signal: n64 kernel bugfix of MIPS32 o32 ABI sigaction syscall
Date: Fri, 16 Oct 2015 11:13:10 -0700 [thread overview]
Message-ID: <56213E36.7060108@imgtec.com> (raw)
In-Reply-To: <5620B129.4020008@imgtec.com>
On 10/16/2015 01:11 AM, Markos Chandras wrote:
> On 10/15/2015 07:50 PM, Leonid Yegoshin wrote:
>> MIPS32 o32 ABI sigaction() processing on MIPS64 n64 kernel was incorrectly
>> set to processing aka rt_sigaction() variant only.
>>
>> Fixed.
>>
>> Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
>> ---
>> arch/mips/include/asm/signal.h | 15 ++++++++++++---
>> arch/mips/kernel/signal.c | 2 +-
>> 2 files changed, 13 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/mips/include/asm/signal.h b/arch/mips/include/asm/signal.h
>> index 003e273eff4c..06fe599782df 100644
>> --- a/arch/mips/include/asm/signal.h
>> +++ b/arch/mips/include/asm/signal.h
>> @@ -11,11 +11,20 @@
>>
>> #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) \
>> + (config_enabled(CONFIG_64BIT) ? \
>> + (config_enabled(CONFIG_MIPS32_COMPAT) ? \
>> + (abi != &mips_abi_32) : 1) : \
>> + (config_enabled(CONFIG_TRAD_SIGNALS) ? \
>> + ((ka)->sa.sa_flags & SA_SIGINFO) : 1) )
>> #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
>>
> Is this similar to
>
> https://www.linux-mips.org/archives/linux-mips/2015-08/msg00449.html ?
>
It is similar but not exact copy - my patch follows an exact rules and
for exam - doesn't check SA_SIGINFO for n32/n64 ABI. It checks only for o32.
next prev parent reply other threads:[~2015-10-16 18:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-15 18:50 [PATCH] MIPS64: signal: n64 kernel bugfix of MIPS32 o32 ABI sigaction syscall Leonid Yegoshin
2015-10-16 8:11 ` Markos Chandras
2015-10-16 18:13 ` Leonid Yegoshin [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-10-15 18:49 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=56213E36.7060108@imgtec.com \
--to=leonid.yegoshin@imgtec.com \
--cc=Markos.Chandras@imgtec.com \
--cc=alex.smith@imgtec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=luto@amacapital.net \
--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