From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752719AbaEVXGg (ORCPT ); Thu, 22 May 2014 19:06:36 -0400 Received: from smtp.outflux.net ([198.145.64.163]:59846 "EHLO smtp.outflux.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751145AbaEVXGd (ORCPT ); Thu, 22 May 2014 19:06:33 -0400 From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , Andy Lutomirski , Oleg Nesterov , Alexander Viro , Peter Zijlstra , James Morris , Eric Paris , Juri Lelli , John Stultz , "David S. Miller" , Daniel Borkmann , Alex Thorlton , Rik van Riel , Daeseok Youn , David Rientjes , "Eric W. Biederman" , Dario Faggioli , Rashika Kheria , liguang , Geert Uytterhoeven , linux-doc@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH v5 1/6] seccomp: create internal mode-setting function Date: Thu, 22 May 2014 16:05:31 -0700 Message-Id: <1400799936-26499-2-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1400799936-26499-1-git-send-email-keescook@chromium.org> References: <1400799936-26499-1-git-send-email-keescook@chromium.org> X-HELO: www.outflux.net Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation for having other callers of the seccomp mode setting logic, split the prctl entry point away from the core logic that performs seccomp mode setting. Signed-off-by: Kees Cook --- kernel/seccomp.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/kernel/seccomp.c b/kernel/seccomp.c index b35c21503a36..8bbe20111222 100644 --- a/kernel/seccomp.c +++ b/kernel/seccomp.c @@ -465,7 +465,7 @@ long prctl_get_seccomp(void) } /** - * prctl_set_seccomp: configures current->seccomp.mode + * seccomp_set_mode: internal function for setting seccomp mode * @seccomp_mode: requested mode to use * @filter: optional struct sock_fprog for use with SECCOMP_MODE_FILTER * @@ -478,7 +478,7 @@ long prctl_get_seccomp(void) * * Returns 0 on success or -EINVAL on failure. */ -long prctl_set_seccomp(unsigned long seccomp_mode, char __user *filter) +static long seccomp_set_mode(unsigned long seccomp_mode, char __user *filter) { long ret = -EINVAL; @@ -509,3 +509,18 @@ long prctl_set_seccomp(unsigned long seccomp_mode, char __user *filter) out: return ret; } + +/** + * prctl_set_seccomp: configures current->seccomp.mode + * @seccomp_mode: requested mode to use + * @filter: optional struct sock_fprog for use with SECCOMP_MODE_FILTER + * + * Returns 0 on success or -EINVAL on failure. + */ +long prctl_set_seccomp(unsigned long seccomp_mode, char __user *filter) +{ + long ret; + + ret = seccomp_set_mode(seccomp_mode, filter); + return ret; +} -- 1.7.9.5