nftables: add inbound ipsec matching
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 nftables: add inbound ipsec matching
This can be used to check if a packet has a secpath attached to it, i.e. was subject to ipsec processing. Example:
add rule inet raw prerouting meta secpath exists accept
More complex matching implemented in xt_policy is not supported at this point.
Florian Westphal
maintainerPATCH 1/1 netfilter: meta: secpath support
replacement for iptables "-m policy --dir in --policy {ipsec,none}".
--- include/uapi/linux/netfilter/nf_tables.h | 2 ++ net/netfilter/nft_meta.c | 39 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+)
include/uapi/linux/netfilter/nf_tables.h +2 -0
@@ -777,6 +777,7 @@ enum nft_exthdr_attributes {* @NFT_META_OIFGROUP: packet output interface group * @NFT_META_CGROUP: socket control group (skb->sk->sk_classid) * @NFT_META_PRANDOM: a 32bit pseudo-random number +* @NFT_META_SECPATH: boolean, secpath_exists (!!skb->sp) */ enum nft_meta_keys {NFT_META_LEN ,
@@ -804,6 +805,7 @@ enum nft_meta_keys {NFT_META_OIFGROUP ,NFT_META_CGROUP ,NFT_META_PRANDOM , + NFT_META_SECPATH, };/**
net/netfilter/nft_meta.c +39 -0
@@ -210,6 +210,11 @@ void nft_meta_get_eval(const struct nft_expr *expr, *dest =prandom_u32_state (state);break ; } +#ifdef CONFIG_XFRM +case NFT_META_SECPATH : +nft_reg_store8 (dest, !!skb->sp); +break ; +#endif default :WARN_ON (1 ); goto err;
@@ -308,6 +313,11 @@ int nft_meta_get_init(const struct nft_ctx *ctx,prandom_init_once (&nft_prandom_state); len =sizeof (u32);break ; +#ifdef CONFIG_XFRM +case NFT_META_SECPATH : + len =sizeof (u8); +break ; +#endif default :return -EOPNOTSUPP ; }
@@ -318,6 +328,34 @@ int nft_meta_get_init(const struct nft_ctx *ctx, }EXPORT_SYMBOL_GPL (nft_meta_get_init); +int nft_meta_get_validate (const struct nft_ctx *ctx, +const struct nft_expr *expr, +const struct nft_data **data) +{ +const struct nft_meta *priv =nft_expr_priv (expr); +unsigned int hooks; + +if (priv->key !=NFT_META_SECPATH ) +return 0 ; + +switch (ctx->afi->family) { +case NFPROTO_NETDEV : + hooks =1 <<NF_NETDEV_INGRESS ; +break ; +case NFPROTO_IPV4 : +case NFPROTO_IPV6 : +case NFPROTO_INET : + hooks = (1 <<NF_INET_PRE_ROUTING ) | + (1 <<NF_INET_LOCAL_IN ) | + (1 <<NF_INET_FORWARD ); +break ; +default : +return -EOPNOTSUPP ; + } + +return nft_chain_validate_hooks (ctx->chain, hooks); +} +int nft_meta_set_validate (const struct nft_ctx *ctx,const struct nft_expr *expr,const struct nft_data **data)
@@ -434,6 +472,7 @@ static const struct nft_expr_ops nft_meta_get_ops = { .eval = nft_meta_get_eval, .init = nft_meta_get_init, .dump = nft_meta_get_dump, + .validate = nft_meta_get_validate, };static const struct nft_expr_ops nft_meta_set_ops = {
Signature · 1 line
2.13.6
Florian Westphal
maintainerRe: [PATCH nf-next] netfilter: meta: secpath support
net/netfilter/nft_meta.c int nft_meta_get_init(const struct nft_ctx *ctx, · line 333
Quoted 3 lines · Florian Westphal
net/netfilter/nft_meta.c +3
-0+int nft_meta_get_validate (const struct nft_ctx *ctx, +const struct nft_expr *expr, +const struct nft_data **data)
Sigh, this should be static of course.
I will not send a v2 for now.
Re: [PATCH nf-next] netfilter: meta: secpath support
In reply to Florian WestphalQuoted 60 lines · Florian Westphal
replacement for iptables "-m policy --dir in --policy {ipsec,none}".
Signed-off-by Florian Westphal <[email protected]>--- include/uapi/linux/netfilter/nf_tables.h | 2 ++ net/netfilter/nft_meta.c | 39 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+)include/uapi/linux/netfilter/nf_tables.h +2
-0@@ -777,6 +777,7 @@ enum nft_exthdr_attributes {* @NFT_META_OIFGROUP: packet output interface group * @NFT_META_CGROUP: socket control group (skb->sk->sk_classid) * @NFT_META_PRANDOM: a 32bit pseudo-random number +* @NFT_META_SECPATH: boolean, secpath_exists (!!skb->sp) */ enum nft_meta_keys {NFT_META_LEN ,@@ -804,6 +805,7 @@ enum nft_meta_keys {NFT_META_OIFGROUP ,NFT_META_CGROUP ,NFT_META_PRANDOM , + NFT_META_SECPATH, };/** net/netfilter/nft_meta.c +10
-0@@ -210,6 +210,11 @@ void nft_meta_get_eval(const struct nft_expr *expr, *dest =prandom_u32_state (state);break ; } +#ifdef CONFIG_XFRM +case NFT_META_SECPATH : +nft_reg_store8 (dest, !!skb->sp); +break ; +#endif default :WARN_ON (1 ); goto err;@@ -308,6 +313,11 @@ int nft_meta_get_init(const struct nft_ctx *ctx,prandom_init_once (&nft_prandom_state); len =sizeof (u32);break ; +#ifdef CONFIG_XFRM +case NFT_META_SECPATH : + len =sizeof (u8); +break ; +#endif default :return -EOPNOTSUPP ; }@@ -318,6 +328,34 @@ int nft_meta_get_init(const struct nft_ctx *ctx, }EXPORT_SYMBOL_GPL (nft_meta_get_init);
net/netfilter/nft_meta.c int nft_meta_get_init(const struct nft_ctx *ctx, · line 340
Quoted 10 lines
net/netfilter/nft_meta.c +10
-0+int nft_meta_get_validate (const struct nft_ctx *ctx, +const struct nft_expr *expr, +const struct nft_data **data) +{ +const struct nft_meta *priv =nft_expr_priv (expr); +unsigned int hooks; + +if (priv->key !=NFT_META_SECPATH ) +return 0 ; +
Would it worth adding here something like this?
#ifnfdef CONFIG_XFRM
return -EOPNOTSUPP;#endif
I mean, if CONFIG_XFRM is not defined, then _get_eval() is doing nothing, right?
Quoted 17 lines
net/netfilter/nft_meta.c +17
-0+switch (ctx->afi->family) { +case NFPROTO_NETDEV : + hooks =1 <<NF_NETDEV_INGRESS ; +break ; +case NFPROTO_IPV4 : +case NFPROTO_IPV6 : +case NFPROTO_INET : + hooks = (1 <<NF_INET_PRE_ROUTING ) | + (1 <<NF_INET_LOCAL_IN ) | + (1 <<NF_INET_FORWARD ); +break ; +default : +return -EOPNOTSUPP ; + } + +return nft_chain_validate_hooks (ctx->chain, hooks); +}
Florian Westphal
maintainerRe: [PATCH nf-next] netfilter: meta: secpath support
Quoted 11 lines · Arturo Borrero Gonzalez
net/netfilter/nft_meta.c int nft_meta_get_init(const struct nft_ctx *ctx, · line 340
Quoted 3 lines
net/netfilter/nft_meta.c +3
-0+if (priv->key !=NFT_META_SECPATH ) +return 0 ; +Would it worth adding here something like this?
#ifnfdef CONFIG_XFRM return -EOPNOTSUPP;#endif
I mean, if
CONFIG_XFRMis not defined, then_get_eval()is doing nothing, right?
Right, I'll add it.
kbuild test robot
build botRe: [PATCH nf-next] netfilter: meta: secpath support
In reply to Florian WestphalI love your patch! Perhaps something to improve:
Hi Florian,
I love your patch! Perhaps something to improve:
[auto build test WARNING on nf-next/master]
url: https://github.com/0day-ci/linux/commits/Florian-Westphal/netfilter-meta-secpath-support/20171204-124857 base: https://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git master reproduce: # apt-get install sparse make ARCH=x86_64 allmodconfig make C=1 CF=-D__CHECK_ENDIAN__
sparse warnings: (new ones prefixed by >>)
Please review and possibly fold the followup patch.
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
kbuild test robot
build bot[RFC PATCH] netfilter: meta: nft_meta_get_validate() can be static
In reply to Florian WestphalFixes: dce1fc524886 ("netfilter: meta: secpath support")
--- nft_meta.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/nft_meta.c +3 -3
@@ -328,9 +328,9 @@ int nft_meta_get_init(const struct nft_ctx *ctx, }EXPORT_SYMBOL_GPL (nft_meta_get_init); -int nft_meta_get_validate (const struct nft_ctx *ctx, -const struct nft_expr *expr, -const struct nft_data **data) +static int nft_meta_get_validate (const struct nft_ctx *ctx, +const struct nft_expr *expr, +const struct nft_data **data) {const struct nft_meta *priv =nft_expr_priv (expr);unsigned int hooks;
Pablo Neira Ayuso
maintainerRe: [RFC PATCH] netfilter: meta: nft_meta_get_validate() can be static
Quoted 3 lines · kbuild test robot
Fixes dce1fc524886 ("netfilter: meta: secpath support")Signed-off-by Fengguang Wu <[email protected]>
Florian sent a v2 that fixes this, I'll take that one.
Anyway, thanks for testing netfilter patches kbuild robot.
Florian Westphal
maintainerPATCH 1/1 meta: secpath support
In reply to Florian Westphal--- include/linux/netfilter/nf_tables.h | 2 ++ src/expr/meta.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-)
include/linux/netfilter/nf_tables.h +2 -0
@@ -775,6 +775,7 @@ enum nft_exthdr_attributes {* @NFT_META_OIFGROUP: packet output interface group * @NFT_META_CGROUP: socket control group (skb->sk->sk_classid) * @NFT_META_PRANDOM: a 32bit pseudo-random number +* @NFT_META_SECPATH: boolean, secpath_exists (!!skb->sp) */ enum nft_meta_keys {NFT_META_LEN ,
@@ -802,6 +803,7 @@ enum nft_meta_keys {NFT_META_OIFGROUP ,NFT_META_CGROUP ,NFT_META_PRANDOM , + NFT_META_SECPATH, };/**
src/expr/meta.c +2 -1
@@ -22,7 +22,7 @@#include <libnftnl/rule.h> #ifndef NFT_META_MAX -#define NFT_META_MAX (NFT_META_PRANDOM + 1) +#define NFT_META_MAX (NFT_META_SECPATH + 1)#endif struct nftnl_expr_meta {
@@ -158,6 +158,7 @@ static const char *meta_key2str_array[NFT_META_MAX] = { [NFT_META_OIFGROUP] = "oifgroup", [NFT_META_CGROUP] = "cgroup", [NFT_META_PRANDOM] = "prandom", + [NFT_META_SECPATH] = "secpath", };static const char *meta_key2str (uint8_t key)
Signature · 1 line
2.13.6
Florian Westphal
maintainerPATCH 1/1 meta: add secpath support
In reply to Florian WestphalThis can be used to check if a packet has a secpath attached to it, i.e. was subject to ipsec processing. Example:
add rule inet raw prerouting meta secpath exists accept
--- doc/nft.xml | 10 ++++++++++ include/linux/netfilter/nf_tables.h | 2 ++ src/meta.c | 3 +++ tests/py/inet/meta.t | 2 ++ tests/py/inet/meta.t.payload | 9 +++++++++ 5 files changed, 26 insertions(+)
doc/nft.xml +10 -0
@@ -2503,6 +2503,7 @@ filter output icmpv6 type { echo-request, echo-reply } <arg>oifgroup</arg> <arg>cgroup</arg> <arg>random</arg> + <arg>secpath</arg> </group> </cmdsynopsis> </para>
@@ -2640,6 +2641,12 @@ filter output icmpv6 type { echo-request, echo-reply } <entry>pseudo-random number</entry> <entry>integer (32 bits)</entry> </row> + <row> + <entry>secpath</entry> + <entry>boolean</entry> + <entry>boolean (1 bit)</entry> + </row> + </tbody> </tgroup> </table>
@@ -2724,6 +2731,9 @@ filter output meta oif eth0 # unqualified meta expression filter output oif eth0 + +# packed was subject to ipsec processing +raw prerouting meta secpath exists accept </programlisting> </example> </para>
include/linux/netfilter/nf_tables.h +2 -0
@@ -773,6 +773,7 @@ enum nft_exthdr_attributes {* @NFT_META_OIFGROUP: packet output interface group * @NFT_META_CGROUP: socket control group (skb->sk->sk_classid) * @NFT_META_PRANDOM: a 32bit pseudo-random number +* @NFT_META_SECPATH: boolean, secpath_exists (!!skb->sp) */ enum nft_meta_keys {NFT_META_LEN ,
@@ -800,6 +801,7 @@ enum nft_meta_keys {NFT_META_OIFGROUP ,NFT_META_CGROUP ,NFT_META_PRANDOM , + NFT_META_SECPATH, };/**
src/meta.c +3 -0
@@ -428,6 +428,8 @@ static const struct meta_template meta_templates[] = { [NFT_META_PRANDOM ] =META_TEMPLATE ("random" , &integer_type,4 *BITS_PER_BYTE , BYTEORDER_BIG_ENDIAN), /* avoid conversion; doesn't have endianess */ + [NFT_META_SECPATH ] =META_TEMPLATE ("secpath" , &boolean_type, + BITS_PER_BYTE, BYTEORDER_HOST_ENDIAN), };static bool meta_key_is_qualified (enum nft_meta_keys key)
@@ -439,6 +441,7 @@ static bool meta_key_is_qualified(enum nft_meta_keys key)case NFT_META_PROTOCOL :case NFT_META_PRIORITY :case NFT_META_PRANDOM : +case NFT_META_SECPATH :return true;default :return false;
tests/py/inet/meta.t +2 -0
@@ -12,3 +12,5 @@ meta nfproto ipv4 tcp dport 22;ok meta nfproto ipv4 ip saddr 1.2.3.4;ok;ip saddr 1.2.3.4 meta nfproto ipv6 meta l4proto tcp;ok;meta nfproto ipv6 meta l4proto 6 meta nfproto ipv4 counter ip saddr 1.2.3.4;ok +meta secpath exists;ok +meta secpath missing;ok
tests/py/inet/meta.t.payload +9 -0
@@ -64,3 +64,12 @@ inet test-inet input [ payload load 4b @ network header + 12 => reg 1 ] [ cmp eq reg 1 0x04030201 ] +# meta secpath exists +inet test-inet input + [ meta load secpath => reg 1 ] + [ cmp eq reg 1 0x00000001 ] + +# meta secpath missing +inet test-inet input + [ meta load secpath => reg 1 ] + [ cmp eq reg 1 0x00000000 ]
Signature · 1 line
2.13.6