From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932387AbbJPSNR (ORCPT <rfc822;w@1wt.eu>);
	Fri, 16 Oct 2015 14:13:17 -0400
Received: from mailapp01.imgtec.com ([195.59.15.196]:17096 "EHLO
	mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751968AbbJPSNP (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 16 Oct 2015 14:13:15 -0400
Message-ID: <56213E36.7060108@imgtec.com>
Date: Fri, 16 Oct 2015 11:13:10 -0700
From: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0
MIME-Version: 1.0
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
References: <20151015185020.37483.82586.stgit@ubuntu-yegoshin> <5620B129.4020008@imgtec.com>
In-Reply-To: <5620B129.4020008@imgtec.com>
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Transfer-Encoding: 7bit
X-Originating-IP: [10.20.3.79]
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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.