From: Norbert Manthey <nmanthey@amazon.de>
To: unlisted-recipients:; (no To-header on input)
Cc: Norbert Manthey <nmanthey@amazon.de>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
"David S. Miller" <davem@davemloft.net>,
John Crispin <john@phrozen.org>,
Simon Horman <simon.horman@netronome.com>,
Jakub Kicinski <jakub.kicinski@netronome.com>,
Tom Herbert <tom@quantonium.net>,
Eric Dumazet <edumazet@google.com>,
"Sven Eckelmann" <sven.eckelmann@openmesh.com>,
WANG Cong <xiyou.wangcong@gmail.com>,
David Ahern <dsahern@gmail.com>,
Jon Maloy <jon.maloy@ericsson.com>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: [less-CONFIG_NET 5/7] seccomp: cut off functions not required
Date: Wed, 6 Jun 2018 15:53:24 +0200 [thread overview]
Message-ID: <1528293206-24298-5-git-send-email-nmanthey@amazon.de> (raw)
In-Reply-To: <1528293206-24298-1-git-send-email-nmanthey@amazon.de>
When using CONFIG_SECCOMP_FILTER, not all functions of filter.c and
flow_dissector.c are required. To not pull in more dependencies,
guard the functions that are not required with CONFIG_NET defines.
This way, these functions are enabled in case the file is compiled
because of CONFIG_NET, but they are not present when the file is
compiled because of other configurations.
Signed-off-by: Norbert Manthey <nmanthey@amazon.de>
---
net/core/filter.c | 2 ++
net/core/flow_dissector.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/net/core/filter.c b/net/core/filter.c
index 0d980e9..4ddacb7 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -1063,6 +1063,7 @@ void bpf_prog_destroy(struct bpf_prog *fp)
}
EXPORT_SYMBOL_GPL(bpf_prog_destroy);
+#if defined(CONFIG_NET)
/**
* sk_filter_trim_cap - run a packet through a socket filter
* @sk: sock associated with &sk_buff
@@ -5657,3 +5658,4 @@ int sk_get_filter(struct sock *sk, struct sock_filter __user *ubuf,
release_sock(sk);
return ret;
}
+#endif // CONFIG_NET
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 70e0679..0903444 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -1219,6 +1219,7 @@ u32 skb_get_poff(const struct sk_buff *skb)
return __skb_get_poff(skb, skb->data, &keys, skb_headlen(skb));
}
+#if defined(CONFIG_NET)
__be32 flow_get_u32_src(const struct flow_keys *flow)
{
switch (flow->control.addr_type) {
@@ -1340,6 +1341,7 @@ __u32 __get_hash_from_flowi6(const struct flowi6 *fl6, struct flow_keys *keys)
return flow_hash_from_keys(keys);
}
EXPORT_SYMBOL(__get_hash_from_flowi6);
+#endif // CONFIG_NET
static const struct flow_dissector_key flow_keys_dissector_keys[] = {
{
--
2.7.4
Amazon Development Center Germany GmbH
Berlin - Dresden - Aachen
main office: Krausenstr. 38, 10117 Berlin
Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger
Ust-ID: DE289237879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B
next prev parent reply other threads:[~2018-06-06 13:54 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-06 13:52 Make CONFIG_NET and CONFIG_SECCOMP_FILTER independent of CONFIG_NET Norbert Manthey
2018-06-06 13:53 ` [less-CONFIG_NET 1/7] net: reorder filter code Norbert Manthey
2018-06-06 13:53 ` [less-CONFIG_NET 2/7] net: reorder flow_dissector Norbert Manthey
2018-06-06 13:53 ` [less-CONFIG_NET 3/7] seccomp: include net and bpf files Norbert Manthey
2018-06-06 13:53 ` [less-CONFIG_NET 4/7] seccomp: include nlattr Norbert Manthey
2018-06-06 13:53 ` Norbert Manthey [this message]
2018-06-06 13:53 ` [less-CONFIG_NET 6/7] seccomp: drop CONFIG_NET Norbert Manthey
2018-06-06 13:53 ` [less-CONFIG_NET 7/7] kvm: " Norbert Manthey
2018-06-07 11:20 ` Paolo Bonzini
2018-06-07 11:46 ` Norbert Manthey
2018-06-07 15:48 ` Norbert Manthey
2018-06-28 12:45 ` less-CONFIG_NET v2 Norbert Manthey
2018-06-28 12:45 ` [less-CONFIG_NET v2 1/8] net: reorder filter code Norbert Manthey
2018-06-28 12:45 ` [less-CONFIG_NET v2 2/8] net: reorder flow_dissector Norbert Manthey
2018-06-28 12:45 ` [less-CONFIG_NET v2 3/8] seccomp: include net Norbert Manthey
2018-06-28 12:45 ` [less-CONFIG_NET v2 4/8] seccomp: include nlattr Norbert Manthey
2018-06-28 12:45 ` [less-CONFIG_NET v2 5/8] seccomp: cut off functions not required Norbert Manthey
2018-06-28 12:45 ` [less-CONFIG_NET v2 6/8] bpf: avoid duplicate definitions Norbert Manthey
2018-06-28 12:45 ` [less-CONFIG_NET v2 7/8] seccomp: drop CONFIG_NET Norbert Manthey
2018-06-28 19:02 ` Kees Cook
2018-06-28 12:45 ` [less-CONFIG_NET v2 8/8] kvm: " Norbert Manthey
2018-06-28 12:47 ` Paolo Bonzini
2018-06-06 16:33 ` [less-CONFIG_NET 1/7] net: reorder filter code Willem de Bruijn
2018-06-06 18:19 ` Norbert Manthey
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=1528293206-24298-5-git-send-email-nmanthey@amazon.de \
--to=nmanthey@amazon.de \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@gmail.com \
--cc=edumazet@google.com \
--cc=jakub.kicinski@netronome.com \
--cc=john@phrozen.org \
--cc=jon.maloy@ericsson.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=simon.horman@netronome.com \
--cc=sven.eckelmann@openmesh.com \
--cc=tom@quantonium.net \
--cc=xiyou.wangcong@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).