From: Christian Brauner <christian@brauner.io>
To: linux-kernel@vger.kernel.org
Cc: ebiederm@xmission.com, gregkh@linuxfoundation.org,
mingo@kernel.org, james.morris@microsoft.com,
keescook@chromium.org, peterz@infradead.org, sds@tycho.nsa.gov,
viro@zeniv.linux.org.uk, akpm@linux-foundation.org,
oleg@redhat.com, Christian Brauner <christian@brauner.io>
Subject: [PATCH 8/8] signal: simplify rt_sigaction()
Date: Mon, 28 May 2018 15:49:16 +0200 [thread overview]
Message-ID: <20180528134916.7568-9-christian@brauner.io> (raw)
In-Reply-To: <20180528134916.7568-1-christian@brauner.io>
The goto is not needed and does not add any clarity. Simply return -EINVAL
on unexpected sigset_t struct size directly.
Signed-off-by: Christian Brauner <christian@brauner.io>
---
kernel/signal.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/kernel/signal.c b/kernel/signal.c
index 42a7b067a49c..96c58de43ddf 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -3741,24 +3741,21 @@ SYSCALL_DEFINE4(rt_sigaction, int, sig,
size_t, sigsetsize)
{
struct k_sigaction new_sa, old_sa;
- int ret = -EINVAL;
+ int ret;
/* XXX: Don't preclude handling different sized sigset_t's. */
if (sigsetsize != sizeof(sigset_t))
- goto out;
+ return -EINVAL;
- if (act) {
+ if (act)
if (copy_from_user(&new_sa.sa, act, sizeof(new_sa.sa)))
return -EFAULT;
- }
ret = do_sigaction(sig, act ? &new_sa : NULL, oact ? &old_sa : NULL);
-
- if (!ret && oact) {
+ if (!ret && oact)
if (copy_to_user(oact, &old_sa.sa, sizeof(old_sa.sa)))
return -EFAULT;
- }
-out:
+
return ret;
}
#ifdef CONFIG_COMPAT
--
2.17.0
next prev parent reply other threads:[~2018-05-28 13:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-28 13:49 [PATCH 0/8] signal: refactor some functions Christian Brauner
2018-05-28 13:49 ` [PATCH 1/8] signal: make force_sigsegv() void Christian Brauner
2018-05-28 13:49 ` [PATCH 2/8] signal: make kill_as_cred_perm() return bool Christian Brauner
2018-05-28 14:07 ` Al Viro
2018-05-28 18:31 ` Christian Brauner
2018-05-28 13:49 ` [PATCH 3/8] signal: make may_ptrace_stop() " Christian Brauner
2018-05-28 14:12 ` Al Viro
2018-05-28 18:30 ` Christian Brauner
2018-05-28 13:49 ` [PATCH 4/8] signal: add copy_pending() helper Christian Brauner
2018-05-28 13:49 ` [PATCH 5/8] signal: flatten do_send_sig_info() Christian Brauner
2018-05-28 14:15 ` Al Viro
2018-05-28 15:07 ` Christian Brauner
2018-05-28 13:49 ` [PATCH 6/8] signal: drop else branch in do_signal_stop() Christian Brauner
2018-05-28 13:49 ` [PATCH 7/8] signal: make do_sigpending() void Christian Brauner
2018-05-28 14:20 ` Al Viro
2018-05-28 13:49 ` Christian Brauner [this message]
2018-05-29 6:47 ` [PATCH 8/8] signal: simplify rt_sigaction() Christoph Hellwig
2018-05-29 10:24 ` Christian Brauner
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=20180528134916.7568-9-christian@brauner.io \
--to=christian@brauner.io \
--cc=akpm@linux-foundation.org \
--cc=ebiederm@xmission.com \
--cc=gregkh@linuxfoundation.org \
--cc=james.morris@microsoft.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=sds@tycho.nsa.gov \
--cc=viro@zeniv.linux.org.uk \
/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
all inboxes | Powered by JetHome®