linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Rutland <mark.rutland@arm.com>
To: linux-arm-kernel@lists.infradead.org, will.deacon@arm.com
Cc: linux-kernel@vger.kernel.org, catalin.marinas@arm.com,
	dave.martin@arm.com, hch@infradead.org, james.morse@arm.com,
	linux@dominikbrodowski.net, linux-fsdevel@vger.kernel.org,
	marc.zyngier@arm.com, mark.rutland@arm.com,
	viro@zeniv.linux.org.uk
Subject: [PATCHv4 16/19] arm64: use {COMPAT,}SYSCALL_DEFINE0 for sigreturn
Date: Mon,  2 Jul 2018 12:04:12 +0100	[thread overview]
Message-ID: <20180702110415.10465-17-mark.rutland@arm.com> (raw)
In-Reply-To: <20180702110415.10465-1-mark.rutland@arm.com>

We don't currently annotate our various sigreturn functions as syscalls,
as we need to do to use pt_regs syscall wrappers.

Let's mark them as real syscalls.

For compat_sys_sigreturn and compat_sys_rt_sigreturn, this changes the
return type from int to long, matching the prototypes in sys32.c.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Dominik Brodowski <linux@dominikbrodowski.net>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
---
 arch/arm64/kernel/signal.c   | 2 +-
 arch/arm64/kernel/signal32.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c
index f03e664f773f..f8b0ba50e55e 100644
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@ -539,7 +539,7 @@ static int restore_sigframe(struct pt_regs *regs,
 	return err;
 }
 
-asmlinkage long sys_rt_sigreturn(void)
+SYSCALL_DEFINE0(rt_sigreturn)
 {
 	struct pt_regs *regs = current_pt_regs();
 	struct rt_sigframe __user *frame;
diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c
index cb10588a7cb2..1948566dcccf 100644
--- a/arch/arm64/kernel/signal32.c
+++ b/arch/arm64/kernel/signal32.c
@@ -282,7 +282,7 @@ static int compat_restore_sigframe(struct pt_regs *regs,
 	return err;
 }
 
-asmlinkage int compat_sys_sigreturn(void)
+COMPAT_SYSCALL_DEFINE0(sigreturn)
 {
 	struct pt_regs *regs = current_pt_regs();
 	struct compat_sigframe __user *frame;
@@ -313,7 +313,7 @@ asmlinkage int compat_sys_sigreturn(void)
 	return 0;
 }
 
-asmlinkage int compat_sys_rt_sigreturn(void)
+COMPAT_SYSCALL_DEFINE0(rt_sigreturn)
 {
 	struct pt_regs *regs = current_pt_regs();
 	struct compat_rt_sigframe __user *frame;
-- 
2.11.0


  parent reply	other threads:[~2018-07-02 11:06 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-02 11:03 [PATCHv4 00/19] arm64: invoke syscalls with pt_regs Mark Rutland
2018-07-02 11:03 ` [PATCHv4 01/19] arm64: consistently use unsigned long for thread flags Mark Rutland
2018-07-02 11:03 ` [PATCHv4 02/19] arm64: move SCTLR_EL{1,2} assertions to <asm/sysreg.h> Mark Rutland
2018-07-02 11:03 ` [PATCHv4 03/19] arm64: kill config_sctlr_el1() Mark Rutland
2018-07-02 11:04 ` [PATCHv4 04/19] arm64: kill change_cpacr() Mark Rutland
2018-07-02 11:04 ` [PATCHv4 05/19] arm64: move sve_user_{enable,disable} to <asm/fpsimd.h> Mark Rutland
2018-07-02 11:04 ` [PATCHv4 06/19] arm64: remove sigreturn wrappers Mark Rutland
2018-07-02 11:04 ` [PATCHv4 07/19] arm64: convert raw syscall invocation to C Mark Rutland
2018-07-02 11:04 ` [PATCHv4 08/19] arm64: convert syscall trace logic " Mark Rutland
2018-07-02 11:04 ` [PATCHv4 09/19] arm64: convert native/compat syscall entry " Mark Rutland
2018-07-02 11:04 ` [PATCHv4 10/19] arm64: don't restore GPRs when context tracking Mark Rutland
2018-07-02 11:04 ` [PATCHv4 11/19] arm64: don't reload GPRs after apply_ssbd Mark Rutland
2018-07-06 16:38   ` Will Deacon
2018-07-09 14:21     ` Mark Rutland
2018-07-10 10:37       ` Dave Martin
2018-07-10 17:33         ` Will Deacon
2018-07-11  9:46           ` Mark Rutland
2018-07-02 11:04 ` [PATCHv4 12/19] arm64: zero GPRs upon entry from EL0 Mark Rutland
2018-07-02 11:04 ` [PATCHv4 13/19] kernel: add ksys_personality() Mark Rutland
2018-07-02 11:04 ` [PATCHv4 14/19] kernel: add kcompat_sys_{f,}statfs64() Mark Rutland
2018-07-02 11:04 ` [PATCHv4 15/19] arm64: remove in-kernel call to sys_personality() Mark Rutland
2018-07-02 11:04 ` Mark Rutland [this message]
2018-07-02 11:04 ` [PATCHv4 17/19] arm64: use SYSCALL_DEFINE6() for mmap Mark Rutland
2018-07-02 11:04 ` [PATCHv4 18/19] arm64: convert compat wrappers to C Mark Rutland
2018-07-02 11:04 ` [PATCHv4 19/19] arm64: implement syscall wrappers Mark Rutland
2018-07-06 16:42 ` [PATCHv4 00/19] arm64: invoke syscalls with pt_regs Will Deacon
2018-07-10 10:39 ` Will Deacon
2018-07-11 10:47   ` Mark Rutland
2018-07-11 12:27     ` Will Deacon

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=20180702110415.10465-17-mark.rutland@arm.com \
    --to=mark.rutland@arm.com \
    --cc=catalin.marinas@arm.com \
    --cc=dave.martin@arm.com \
    --cc=hch@infradead.org \
    --cc=james.morse@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@dominikbrodowski.net \
    --cc=marc.zyngier@arm.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=will.deacon@arm.com \
    /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).