From patchwork Fri Jun 24 00:36:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Drewry X-Patchwork-Id: 101709 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DF4F4B6F83 for ; Fri, 24 Jun 2011 10:39:04 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932895Ab1FXAiV (ORCPT ); Thu, 23 Jun 2011 20:38:21 -0400 Received: from mail-yi0-f46.google.com ([209.85.218.46]:64818 "EHLO mail-yi0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964943Ab1FXAiT (ORCPT ); Thu, 23 Jun 2011 20:38:19 -0400 Received: by mail-yi0-f46.google.com with SMTP id 27so923901yia.19 for ; Thu, 23 Jun 2011 17:38:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=Y9d230dIGYD5dd8LV0vX65E0xhTEnozxF+KSReJqITs=; b=mWD07KiP92JHIDdkCHGHNjSLuNbhQ/dhejEU9tOF3JG6602s6yFKqvwgCMegPsGPwh JgNjh2RQPtCg8ZNxQ0tawUJ6s/weZfYRqi//vxBTm9ESSePTtLTUj7Z9yPJSyPO8/CeT YdYaXtfO74HJN6mhKq2jwlEFgnp2WSEsN55Ks= DomainKey-Signature: a=rsa-sha1; c=nofws; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=XmRtYR7IeVcSt8obHyo0dyTGYxysEc1ccqDjN8UZazp48SytER3GqfmHUXnZKqrG1R ncee8awwACBySRZYAggEB4NI2DRusf740jkFmCtPb3qfem1F9Myt9l4MlbbdsEAhi+Qe NxttNzxixSozn0EFIcrOCyJrpgf2HBI85IEr0= Received: by 10.236.37.202 with SMTP id y50mr2681652yha.195.1308875898782; Thu, 23 Jun 2011 17:38:18 -0700 (PDT) Received: from localhost.localdomain (adsl-98-87-50-218.bna.bellsouth.net [98.87.50.218]) by mx.google.com with ESMTPS id e4sm1387867yhm.36.2011.06.23.17.38.17 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Jun 2011 17:38:18 -0700 (PDT) From: Will Drewry To: linux-kernel@vger.kernel.org Cc: torvalds@linux-foundation.org, djm@mindrot.org, segoon@openwall.com, kees.cook@canonical.com, mingo@elte.hu, rostedt@goodmis.org, jmorris@namei.org, fweisbec@gmail.com, tglx@linutronix.de, scarybeasts@gmail.com, Will Drewry , "David S. Miller" , sparclinux@vger.kernel.org Subject: [PATCH v9 12/13] sparc: select HAVE_SECCOMP_FILTER and provide seccomp_execve Date: Thu, 23 Jun 2011 19:36:51 -0500 Message-Id: <1308875813-20122-12-git-send-email-wad@chromium.org> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1308875813-20122-1-git-send-email-wad@chromium.org> References: <1308875813-20122-1-git-send-email-wad@chromium.org> Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Facilitate the use of CONFIG_SECCOMP_FILTER by wrapping compatibility system call numbering for execve and selecting HAVE_SECCOMP_FILTER. v9: rebase on to bccaeafd7c117acee36e90d37c7e05c19be9e7bf Signed-off-by: Will Drewry --- arch/sparc/Kconfig | 2 ++ arch/sparc/include/asm/seccomp.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 253986b..d4d0ec4 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -26,6 +26,7 @@ config SPARC select HAVE_DMA_API_DEBUG select HAVE_ARCH_JUMP_LABEL select HAVE_GENERIC_HARDIRQS + select HAVE_SECCOMP_FILTER select GENERIC_IRQ_SHOW select USE_GENERIC_SMP_HELPERS if SMP @@ -42,6 +43,7 @@ config SPARC64 select HAVE_KRETPROBES select HAVE_KPROBES select HAVE_MEMBLOCK + select HAVE_SECCOMP_FILTER select HAVE_SYSCALL_WRAPPERS select HAVE_DYNAMIC_FTRACE select HAVE_FTRACE_MCOUNT_RECORD diff --git a/arch/sparc/include/asm/seccomp.h b/arch/sparc/include/asm/seccomp.h index adca1bc..a1dac08 100644 --- a/arch/sparc/include/asm/seccomp.h +++ b/arch/sparc/include/asm/seccomp.h @@ -6,10 +6,12 @@ #define __NR_seccomp_write __NR_write #define __NR_seccomp_exit __NR_exit #define __NR_seccomp_sigreturn __NR_rt_sigreturn +#define __NR_seccomp_execve __NR_execve #define __NR_seccomp_read_32 __NR_read #define __NR_seccomp_write_32 __NR_write #define __NR_seccomp_exit_32 __NR_exit #define __NR_seccomp_sigreturn_32 __NR_sigreturn +#define __NR_seccomp_execve_32 __NR_execve #endif /* _ASM_SECCOMP_H */