From patchwork Wed Aug 17 14:00:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mack X-Patchwork-Id: 660129 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 3sDrkQ2SYLz9t2Q for ; Thu, 18 Aug 2016 00:11:26 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752805AbcHQOLS (ORCPT ); Wed, 17 Aug 2016 10:11:18 -0400 Received: from svenfoo.org ([82.94.215.22]:47312 "EHLO mail.zonque.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752345AbcHQOLP (ORCPT ); Wed, 17 Aug 2016 10:11:15 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.zonque.de (Postfix) with ESMTP id 98593B8224; Wed, 17 Aug 2016 16:00:59 +0200 (CEST) Received: from mail.zonque.de ([127.0.0.1]) by localhost (rambrand.bugwerft.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vO9pWG2DKuj4; Wed, 17 Aug 2016 16:00:59 +0200 (CEST) Received: from rabotti.localdomain (p5DDC7225.dip0.t-ipconnect.de [93.220.114.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.zonque.de (Postfix) with ESMTPSA id EAE93B8220; Wed, 17 Aug 2016 16:00:58 +0200 (CEST) From: Daniel Mack To: htejun@fb.com, daniel@iogearbox.net, ast@fb.com Cc: davem@davemloft.net, kafai@fb.com, fw@strlen.de, pablo@netfilter.org, harald@redhat.com, netdev@vger.kernel.org, Daniel Mack Subject: [RFC PATCH 4/5] net: filter: run cgroup eBPF programs Date: Wed, 17 Aug 2016 16:00:47 +0200 Message-Id: <1471442448-1248-5-git-send-email-daniel@zonque.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1471442448-1248-1-git-send-email-daniel@zonque.org> References: <1471442448-1248-1-git-send-email-daniel@zonque.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If CONFIG_CGROUP_BPF is enabled, and the cgroup associated with the receiving socket has an eBPF programs installed, run them from sk_filter_trim_cap(). eBPF programs used in this context are expected to either return 1 to let the packet pass, or != 1 to drop them. The programs have access to the full skb, including the MAC headers. This patch only implements the call site for ingress packets. Signed-off-by: Daniel Mack --- net/core/filter.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/net/core/filter.c b/net/core/filter.c index c5d8332..a1dd94b 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -52,6 +52,44 @@ #include #include +#ifdef CONFIG_CGROUP_BPF +static int sk_filter_cgroup_bpf(struct sock *sk, struct sk_buff *skb, + enum bpf_attach_type type) +{ + struct sock_cgroup_data *skcd = &sk->sk_cgrp_data; + struct cgroup *cgrp = sock_cgroup_ptr(skcd); + struct bpf_prog *prog; + int ret = 0; + + rcu_read_lock(); + + switch (type) { + case BPF_ATTACH_TYPE_CGROUP_EGRESS: + prog = rcu_dereference(cgrp->bpf_egress); + break; + case BPF_ATTACH_TYPE_CGROUP_INGRESS: + prog = rcu_dereference(cgrp->bpf_ingress); + break; + default: + WARN_ON_ONCE(1); + ret = -EINVAL; + break; + } + + if (prog) { + unsigned int offset = skb->data - skb_mac_header(skb); + + __skb_push(skb, offset); + ret = bpf_prog_run_clear_cb(prog, skb) > 0 ? 0 : -EPERM; + __skb_pull(skb, offset); + } + + rcu_read_unlock(); + + return ret; +} +#endif /* !CONFIG_CGROUP_BPF */ + /** * sk_filter_trim_cap - run a packet through a socket filter * @sk: sock associated with &sk_buff @@ -78,6 +116,12 @@ int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb, unsigned int cap) if (skb_pfmemalloc(skb) && !sock_flag(sk, SOCK_MEMALLOC)) return -ENOMEM; +#ifdef CONFIG_CGROUP_BPF + err = sk_filter_cgroup_bpf(sk, skb, BPF_ATTACH_TYPE_CGROUP_INGRESS); + if (err) + return err; +#endif + err = security_sock_rcv_skb(sk, skb); if (err) return err;