From: Eric Dumazet <eric.dumazet@gmail.com>
To: Will Drewry <wad@chromium.org>
Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
linux-doc@vger.kernel.org, kernel-hardening@lists.openwall.com,
netdev@vger.kernel.org, x86@kernel.org, arnd@arndb.de,
davem@davemloft.net, hpa@zytor.com, mingo@redhat.com,
oleg@redhat.com, peterz@infradead.org, rdunlap@xenotime.net,
mcgrathr@chromium.org, tglx@linutronix.de, luto@mit.edu,
eparis@redhat.com, serge.hallyn@canonical.com, djm@mindrot.org,
scarybeasts@gmail.com, indan@nul.nu, pmoore@redhat.com,
akpm@linux-foundation.org, corbet@lwn.net, markus@chromium.org,
coreyb@linux.vnet.ibm.com, keescook@chromium.org
Subject: Re: [PATCH v15 01/13] sk_run_filter: add BPF_S_ANC_SECCOMP_LD_W
Date: Fri, 16 Mar 2012 11:15:37 -0700 [thread overview]
Message-ID: <1331921737.19406.19.camel@edumazet-glaptop> (raw)
In-Reply-To: <1331781125-15658-2-git-send-email-wad@chromium.org>
On Wed, 2012-03-14 at 22:11 -0500, Will Drewry wrote:
> Introduces a new BPF ancillary instruction that all LD calls will be
> mapped through when skb_run_filter() is being used for seccomp BPF. The
> rewriting will be done using a secondary chk_filter function that is run
> after skb_chk_filter.
>
> The code change is guarded by CONFIG_SECCOMP_FILTER which is added,
> along with the seccomp_bpf_load() function later in this series.
>
> This is based on http://lkml.org/lkml/2012/3/2/141
>
> v15: include seccomp.h explicitly for when seccomp_bpf_load exists.
> v14: First cut using a single additional instruction
> ... v13: made bpf functions generic.
>
> Suggested-by: Indan Zupancic <indan@nul.nu>
> Signed-off-by: Will Drewry <wad@chromium.org>
> ---
> include/linux/filter.h | 1 +
> net/core/filter.c | 6 ++++++
> 2 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/include/linux/filter.h b/include/linux/filter.h
> index 8eeb205..aaa2e80 100644
> --- a/include/linux/filter.h
> +++ b/include/linux/filter.h
> @@ -228,6 +228,7 @@ enum {
> BPF_S_ANC_HATYPE,
> BPF_S_ANC_RXHASH,
> BPF_S_ANC_CPU,
> + BPF_S_ANC_SECCOMP_LD_W,
> };
>
> #endif /* __KERNEL__ */
> diff --git a/net/core/filter.c b/net/core/filter.c
> index 5dea452..d775edc 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -39,6 +39,7 @@
> #include <linux/filter.h>
> #include <linux/reciprocal_div.h>
> #include <linux/ratelimit.h>
> +#include <linux/seccomp.h>
>
> /* No hurry in this branch */
> static void *__load_pointer(const struct sk_buff *skb, int k, unsigned int size)
> @@ -350,6 +351,11 @@ load_b:
> A = 0;
> continue;
> }
> +#ifdef CONFIG_SECCOMP_FILTER
> + case BPF_S_ANC_SECCOMP_LD_W:
> + A = seccomp_bpf_load(fentry->k);
> + continue;
> +#endif
> default:
> WARN_RATELIMIT(1, "Unknown code:%u jt:%u tf:%u k:%u\n",
> fentry->code, fentry->jt,
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
next prev parent reply other threads:[~2012-03-16 18:15 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-15 3:11 [PATCH v15 00/13] seccomp_filter: syscall filtering using BPF Will Drewry
2012-03-15 3:11 ` [PATCH v15 01/13] sk_run_filter: add BPF_S_ANC_SECCOMP_LD_W Will Drewry
2012-03-16 18:15 ` Eric Dumazet [this message]
2012-03-15 3:11 ` [PATCH v15 02/13] net/compat.c,linux/filter.h: share compat_sock_fprog Will Drewry
2012-03-16 18:16 ` Eric Dumazet
2012-03-16 19:23 ` Will Drewry
2012-03-15 3:11 ` [PATCH v15 03/13] seccomp: kill the seccomp_t typedef Will Drewry
2012-03-15 3:11 ` [PATCH v15 04/13] arch/x86: add syscall_get_arch to syscall.h Will Drewry
2012-03-25 19:34 ` H. Peter Anvin
2012-04-11 3:13 ` Will Drewry
2012-04-11 3:16 ` H. Peter Anvin
2012-04-11 3:20 ` H. Peter Anvin
2012-04-11 15:41 ` Will Drewry
2012-03-15 3:11 ` [PATCH v15 05/13] asm/syscall.h: add syscall_get_arch Will Drewry
2012-03-15 3:11 ` [PATCH v15 06/13] seccomp: add system call filtering using BPF Will Drewry
2012-03-25 7:31 ` Vladimir Murzin
2012-03-15 3:11 ` [PATCH v15 07/13] seccomp: remove duplicated failure logging Will Drewry
2012-03-15 3:12 ` [PATCH v15 08/13] seccomp: add SECCOMP_RET_ERRNO Will Drewry
2012-03-15 3:12 ` [PATCH v15 09/13] signal, x86: add SIGSYS info and make it synchronous Will Drewry
2012-03-15 3:12 ` [PATCH v15 10/13] seccomp: Add SECCOMP_RET_TRAP Will Drewry
2012-03-15 3:12 ` [PATCH v15 11/13] ptrace,seccomp: Add PTRACE_SECCOMP support Will Drewry
2012-03-15 4:49 ` Indan Zupancic
2012-03-15 14:40 ` Will Drewry
2012-03-15 3:12 ` [PATCH v15 12/13] x86: Enable HAVE_ARCH_SECCOMP_FILTER Will Drewry
2012-03-15 3:12 ` [PATCH v15 13/13] Documentation: prctl/seccomp_filter Will Drewry
2012-03-25 19:36 ` [PATCH v15 00/13] seccomp_filter: syscall filtering using BPF H. Peter Anvin
2012-03-26 16:53 ` Will Drewry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331921737.19406.19.camel@edumazet-glaptop \
--to=eric.dumazet@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=corbet@lwn.net \
--cc=coreyb@linux.vnet.ibm.com \
--cc=davem@davemloft.net \
--cc=djm@mindrot.org \
--cc=eparis@redhat.com \
--cc=hpa@zytor.com \
--cc=indan@nul.nu \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@mit.edu \
--cc=markus@chromium.org \
--cc=mcgrathr@chromium.org \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=pmoore@redhat.com \
--cc=rdunlap@xenotime.net \
--cc=scarybeasts@gmail.com \
--cc=serge.hallyn@canonical.com \
--cc=tglx@linutronix.de \
--cc=wad@chromium.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox