From mboxrd@z Thu Jan 1 00:00:00 1970 From: ebiederm@xmission.com (Eric W. Biederman) Subject: [RFC PATCH 1/5] signal: Teach sigsuspend to use set_user_sigmask Date: Fri, 07 Jun 2019 16:41:23 -0500 Message-ID: <87ef45axa4.fsf_-_@xmission.com> References: <20190522032144.10995-1-deepa.kernel@gmail.com> <20190529161157.GA27659@redhat.com> <20190604134117.GA29963@redhat.com> <20190606140814.GA13440@redhat.com> <87k1dxaxcl.fsf_-_@xmission.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <87k1dxaxcl.fsf_-_@xmission.com> (Eric W. Biederman's message of "Fri, 07 Jun 2019 16:39:54 -0500") Sender: owner-linux-aio@kvack.org To: Oleg Nesterov Cc: Andrew Morton , Deepa Dinamani , linux-kernel@vger.kernel.org, arnd@arndb.de, dbueso@suse.de, axboe@kernel.dk, dave@stgolabs.net, e@80x24.org, jbaron@akamai.com, linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, omar.kilani@gmail.com, tglx@linutronix.de, Al Viro , Linus Torvalds , David Laight , linux-arch@vger.kernel.org List-Id: linux-arch.vger.kernel.org The sigsuspend system call overrides the signal mask just like all of the other users of set_user_sigmask, so convert it to use the same helpers. Signed-off-by: "Eric W. Biederman" --- kernel/signal.c | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/kernel/signal.c b/kernel/signal.c index 6f72cff043f0..bfa36320a4f7 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -2932,6 +2932,15 @@ int sigprocmask(int how, sigset_t *set, sigset_t *oldset) } EXPORT_SYMBOL(sigprocmask); +static int set_sigmask(sigset_t *kmask) +{ + set_restore_sigmask(); + current->saved_sigmask = current->blocked; + set_current_blocked(kmask); + + return 0; +} + /* * The api helps set app-provided sigmasks. * @@ -2952,11 +2961,7 @@ int set_user_sigmask(const sigset_t __user *umask, size_t sigsetsize) if (copy_from_user(&kmask, umask, sizeof(sigset_t))) return -EFAULT; - set_restore_sigmask(); - current->saved_sigmask = current->blocked; - set_current_blocked(&kmask); - - return 0; + return set_sigmask(&kmask); } #ifdef CONFIG_COMPAT @@ -2972,11 +2977,7 @@ int set_compat_user_sigmask(const compat_sigset_t __user *umask, if (get_compat_sigset(&kmask, umask)) return -EFAULT; - set_restore_sigmask(); - current->saved_sigmask = current->blocked; - set_current_blocked(&kmask); - - return 0; + return set_sigmask(&kmask); } #endif @@ -4409,14 +4410,10 @@ SYSCALL_DEFINE0(pause) static int sigsuspend(sigset_t *set) { - current->saved_sigmask = current->blocked; - set_current_blocked(set); - while (!signal_pending(current)) { __set_current_state(TASK_INTERRUPTIBLE); schedule(); } - set_restore_sigmask(); return -ERESTARTNOHAND; } @@ -4430,12 +4427,10 @@ SYSCALL_DEFINE2(rt_sigsuspend, sigset_t __user *, unewset, size_t, sigsetsize) { sigset_t newset; - /* XXX: Don't preclude handling different sized sigset_t's. */ - if (sigsetsize != sizeof(sigset_t)) - return -EINVAL; - - if (copy_from_user(&newset, unewset, sizeof(newset))) + set_user_sigmask(unewset, sigsetsize); + if (!unewset) return -EFAULT; + return sigsuspend(&newset); } @@ -4444,12 +4439,10 @@ COMPAT_SYSCALL_DEFINE2(rt_sigsuspend, compat_sigset_t __user *, unewset, compat_ { sigset_t newset; - /* XXX: Don't preclude handling different sized sigset_t's. */ - if (sigsetsize != sizeof(sigset_t)) - return -EINVAL; - - if (get_compat_sigset(&newset, unewset)) + set_compat_user_sigmask(unewset, sigsetsize); + if (!unewset) return -EFAULT; + return sigsuspend(&newset); } #endif @@ -4459,6 +4452,7 @@ SYSCALL_DEFINE1(sigsuspend, old_sigset_t, mask) { sigset_t blocked; siginitset(&blocked, mask); + set_sigmask(&blocked); return sigsuspend(&blocked); } #endif @@ -4467,6 +4461,7 @@ SYSCALL_DEFINE3(sigsuspend, int, unused1, int, unused2, old_sigset_t, mask) { sigset_t blocked; siginitset(&blocked, mask); + set_sigmask(&blocked); return sigsuspend(&blocked); } #endif -- 2.21.0.dirty -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to majordomo@kvack.org. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: aart@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out01.mta.xmission.com ([166.70.13.231]:52888 "EHLO out01.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731303AbfFGVli (ORCPT ); Fri, 7 Jun 2019 17:41:38 -0400 From: ebiederm@xmission.com (Eric W. Biederman) References: <20190522032144.10995-1-deepa.kernel@gmail.com> <20190529161157.GA27659@redhat.com> <20190604134117.GA29963@redhat.com> <20190606140814.GA13440@redhat.com> <87k1dxaxcl.fsf_-_@xmission.com> Date: Fri, 07 Jun 2019 16:41:23 -0500 In-Reply-To: <87k1dxaxcl.fsf_-_@xmission.com> (Eric W. Biederman's message of "Fri, 07 Jun 2019 16:39:54 -0500") Message-ID: <87ef45axa4.fsf_-_@xmission.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [RFC PATCH 1/5] signal: Teach sigsuspend to use set_user_sigmask Sender: linux-arch-owner@vger.kernel.org List-ID: To: Oleg Nesterov Cc: Andrew Morton , Deepa Dinamani , linux-kernel@vger.kernel.org, arnd@arndb.de, dbueso@suse.de, axboe@kernel.dk, dave@stgolabs.net, e@80x24.org, jbaron@akamai.com, linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, omar.kilani@gmail.com, tglx@linutronix.de, Al Viro , Linus Torvalds , David Laight , linux-arch@vger.kernel.org Message-ID: <20190607214123.g3oHLz3cr0ZGZC6ptpngdxoCnIaHhTGLNjAngcQeVWc@z> The sigsuspend system call overrides the signal mask just like all of the other users of set_user_sigmask, so convert it to use the same helpers. Signed-off-by: "Eric W. Biederman" --- kernel/signal.c | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/kernel/signal.c b/kernel/signal.c index 6f72cff043f0..bfa36320a4f7 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -2932,6 +2932,15 @@ int sigprocmask(int how, sigset_t *set, sigset_t *oldset) } EXPORT_SYMBOL(sigprocmask); +static int set_sigmask(sigset_t *kmask) +{ + set_restore_sigmask(); + current->saved_sigmask = current->blocked; + set_current_blocked(kmask); + + return 0; +} + /* * The api helps set app-provided sigmasks. * @@ -2952,11 +2961,7 @@ int set_user_sigmask(const sigset_t __user *umask, size_t sigsetsize) if (copy_from_user(&kmask, umask, sizeof(sigset_t))) return -EFAULT; - set_restore_sigmask(); - current->saved_sigmask = current->blocked; - set_current_blocked(&kmask); - - return 0; + return set_sigmask(&kmask); } #ifdef CONFIG_COMPAT @@ -2972,11 +2977,7 @@ int set_compat_user_sigmask(const compat_sigset_t __user *umask, if (get_compat_sigset(&kmask, umask)) return -EFAULT; - set_restore_sigmask(); - current->saved_sigmask = current->blocked; - set_current_blocked(&kmask); - - return 0; + return set_sigmask(&kmask); } #endif @@ -4409,14 +4410,10 @@ SYSCALL_DEFINE0(pause) static int sigsuspend(sigset_t *set) { - current->saved_sigmask = current->blocked; - set_current_blocked(set); - while (!signal_pending(current)) { __set_current_state(TASK_INTERRUPTIBLE); schedule(); } - set_restore_sigmask(); return -ERESTARTNOHAND; } @@ -4430,12 +4427,10 @@ SYSCALL_DEFINE2(rt_sigsuspend, sigset_t __user *, unewset, size_t, sigsetsize) { sigset_t newset; - /* XXX: Don't preclude handling different sized sigset_t's. */ - if (sigsetsize != sizeof(sigset_t)) - return -EINVAL; - - if (copy_from_user(&newset, unewset, sizeof(newset))) + set_user_sigmask(unewset, sigsetsize); + if (!unewset) return -EFAULT; + return sigsuspend(&newset); } @@ -4444,12 +4439,10 @@ COMPAT_SYSCALL_DEFINE2(rt_sigsuspend, compat_sigset_t __user *, unewset, compat_ { sigset_t newset; - /* XXX: Don't preclude handling different sized sigset_t's. */ - if (sigsetsize != sizeof(sigset_t)) - return -EINVAL; - - if (get_compat_sigset(&newset, unewset)) + set_compat_user_sigmask(unewset, sigsetsize); + if (!unewset) return -EFAULT; + return sigsuspend(&newset); } #endif @@ -4459,6 +4452,7 @@ SYSCALL_DEFINE1(sigsuspend, old_sigset_t, mask) { sigset_t blocked; siginitset(&blocked, mask); + set_sigmask(&blocked); return sigsuspend(&blocked); } #endif @@ -4467,6 +4461,7 @@ SYSCALL_DEFINE3(sigsuspend, int, unused1, int, unused2, old_sigset_t, mask) { sigset_t blocked; siginitset(&blocked, mask); + set_sigmask(&blocked); return sigsuspend(&blocked); } #endif -- 2.21.0.dirty