Messages in this thread Patch in this message | | | From | Christian Brauner <> | Subject | [PATCH v1 08/20] signal: simplify rt_sigaction() | Date | Mon, 28 May 2018 23:53:43 +0200 |
| |
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> --- v0->v1: * patch unchanged --- kernel/signal.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/kernel/signal.c b/kernel/signal.c index 3af140048366..7095fa11af15 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
| |