[PATCH v3] MIPS64: signal: n64 kernel bugfix of MIPS32 o32 ABI sigaction syscall

[PATCH v3] MIPS64: signal: n64 kernel bugfix of MIPS32 o32 ABI sigaction syscall

[Leonid Yegoshin]

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

Re: [PATCH v3] MIPS64: signal: n64 kernel bugfix of MIPS32 o32 ABI sigaction syscall

[Markos Chandras]

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

Re: [PATCH v3] MIPS64: signal: n64 kernel bugfix of MIPS32 o32 ABI sigaction syscall

[Leonid Yegoshin]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 254 bytes --]

I mailed it from LMO 'upstream-sfr'.
I pulled it last week.

I will check it again.

- Leonid.ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: [PATCH v3] MIPS64: signal: n64 kernel bugfix of MIPS32 o32 ABI sigaction syscall

[Leonid Yegoshin]

On 10/20/2015 01:35 AM, Markos Chandras wrote:
> What tree did you use for this patch? It does not seem to apply to 
> mainline or Ralf's upstream-sfr. 

May I ask you to elaborate more and send me a concern details?
I definitely rebased it to mips-for-linux-next of upstream-sfr from LMO.

- Leonid

Re: [PATCH v3] MIPS64: signal: n64 kernel bugfix of MIPS32 o32 ABI sigaction syscall

[Markos Chandras]

On 10/20/2015 07:12 PM, Leonid Yegoshin wrote:
> On 10/20/2015 01:35 AM, Markos Chandras wrote:
>> What tree did you use for this patch? It does not seem to apply to
>> mainline or Ralf's upstream-sfr. 
> 
> May I ask you to elaborate more and send me a concern details?
> I definitely rebased it to mips-for-linux-next of upstream-sfr from LMO.
> 
> - Leonid
> 
Ok thanks for clarifying. It does apply to today's upstream-sfr.

-- 
markos