From patchwork Sat Apr 27 02:17:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Wang X-Patchwork-Id: 240074 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 DE20E2C00C8 for ; Sat, 27 Apr 2013 12:19:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756740Ab3D0CSx (ORCPT ); Fri, 26 Apr 2013 22:18:53 -0400 Received: from mail-qe0-f46.google.com ([209.85.128.46]:51651 "EHLO mail-qe0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756484Ab3D0CSv (ORCPT ); Fri, 26 Apr 2013 22:18:51 -0400 Received: by mail-qe0-f46.google.com with SMTP id nd7so2850908qeb.5 for ; Fri, 26 Apr 2013 19:18:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=dq323W1sR7LQgrGnvSM67aLpkBtL+5aQZZIcdE02tBA=; b=QzWePR20AY/kxTt+GwjD1ICjRRHentgDGpeL1mRrbccoUrfgPp3gZajrKMO0TQlRZS hwgGmac6MqxhCxvjZnE8NN9jGaZuRacZQZJf4ERAXgfTR30HMIDGpeJAvkXZAt7Vrko6 7NfAzvc/RG2nfm5PCPsi7yyHO1sbQcrz+5SWSNoICa00KXHd/XrhcM33YVkElHLa77sh n1DqBP8LiySts58705z9Y5Ltlcj+Ijg5b9O7JKQ0c1Q2y9WJvot+Gsr51MAaIXCqEvzo 9A1eKee2BqbswVjEc4XkmmfGOCyan04UqdSafMnL29+XLglfTcinHIr0fY8GNvhBcFWt C3QA== X-Received: by 10.229.115.30 with SMTP id g30mr3593289qcq.100.1367029130093; Fri, 26 Apr 2013 19:18:50 -0700 (PDT) Received: from hchen.csail.mit.edu (hchen.csail.mit.edu. [18.26.5.5]) by mx.google.com with ESMTPSA id m8sm20823928qav.8.2013.04.26.19.18.49 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 26 Apr 2013 19:18:49 -0700 (PDT) From: Xi Wang To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Daniel Borkmann , Heiko Carstens , Will Drewry , Eric Dumazet , Russell King , David Laight , "David S. Miller" , Andrew Morton , Nicolas Schichan , Xi Wang Subject: [PATCH v2 net-next 3/3] ARM: net: bpf_jit_32: support BPF_S_ANC_SECCOMP_LD_W instruction Date: Fri, 26 Apr 2013 22:17:27 -0400 Message-Id: <1367029047-14830-4-git-send-email-xi.wang@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1367029047-14830-1-git-send-email-xi.wang@gmail.com> References: <1367029047-14830-1-git-send-email-xi.wang@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch implements the seccomp BPF_S_ANC_SECCOMP_LD_W instruction in ARM JIT. Signed-off-by: Xi Wang Cc: Daniel Borkmann Cc: Heiko Carstens Cc: Will Drewry Cc: Eric Dumazet Cc: Russell King Cc: David Laight Cc: "David S. Miller" Cc: Andrew Morton Cc: Nicolas Schichan --- arch/arm/net/bpf_jit_32.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c index 073b085..9bfce464 100644 --- a/arch/arm/net/bpf_jit_32.c +++ b/arch/arm/net/bpf_jit_32.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "bpf_jit_32.h" @@ -845,6 +846,19 @@ b_epilogue: off = offsetof(struct sk_buff, queue_mapping); emit(ARM_LDRH_I(r_A, r_skb, off), ctx); break; +#ifdef CONFIG_SECCOMP_FILTER + case BPF_S_ANC_SECCOMP_LD_W: + if (k == offsetof(struct seccomp_data, arch)) { + emit_mov_i(r_A, AUDIT_ARCH_ARM, ctx); + break; + } + ctx->seen |= SEEN_CALL; + emit_mov_i(ARM_R3, (u32)seccomp_bpf_load, ctx); + emit_mov_i(ARM_R0, k, ctx); + emit_blx_r(ARM_R3, ctx); + emit(ARM_MOV_R(r_A, ARM_R0), ctx); + break; +#endif default: return -1; }