Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1250998 > unrolled thread
| Started by | Leonid Yegoshin <Leonid.Yegoshin@imgtec.com> |
|---|---|
| First post | 2015-10-19 20:50 +0200 |
| Last post | 2015-10-21 10:10 +0200 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH v3] MIPS64: signal: n64 kernel bugfix of MIPS32 o32 ABI sigaction syscall Leonid Yegoshin <Leonid.Yegoshin@imgtec.com> - 2015-10-19 20:50 +0200
Re: [PATCH v3] MIPS64: signal: n64 kernel bugfix of MIPS32 o32 ABI sigaction syscall Markos Chandras <Markos.Chandras@imgtec.com> - 2015-10-20 10:40 +0200
Re: [PATCH v3] MIPS64: signal: n64 kernel bugfix of MIPS32 o32 ABI sigaction syscall Leonid Yegoshin <Leonid.Yegoshin@imgtec.com> - 2015-10-20 20:20 +0200
Re: [PATCH v3] MIPS64: signal: n64 kernel bugfix of MIPS32 o32 ABI sigaction syscall Markos Chandras <Markos.Chandras@imgtec.com> - 2015-10-21 10:10 +0200
| From | Leonid Yegoshin <Leonid.Yegoshin@imgtec.com> |
|---|---|
| Date | 2015-10-19 20:50 +0200 |
| Subject | [PATCH v3] MIPS64: signal: n64 kernel bugfix of MIPS32 o32 ABI sigaction syscall |
| Message-ID | <qlnFn-4ut-3@gated-at.bofh.it> |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Markos Chandras <Markos.Chandras@imgtec.com> |
|---|---|
| Date | 2015-10-20 10:40 +0200 |
| Message-ID | <qlACC-6KM-17@gated-at.bofh.it> |
| In reply to | #1250998 |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Leonid Yegoshin <Leonid.Yegoshin@imgtec.com> |
|---|---|
| Date | 2015-10-20 20:20 +0200 |
| Message-ID | <qlJFT-39I-15@gated-at.bofh.it> |
| In reply to | #1251439 |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Markos Chandras <Markos.Chandras@imgtec.com> |
|---|---|
| Date | 2015-10-21 10:10 +0200 |
| Message-ID | <qlWD8-5sb-15@gated-at.bofh.it> |
| In reply to | #1251937 |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web