hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netfilter: nf_tables: rt: allow checking if dst has xfrm attached 

Useful e.g. to avoid NATting inner headers of to-be-encrypted packets.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal 2018-08-29 00:19:00 +02:00 committed by Pablo Neira Ayuso
parent a82738adff
commit 02b408fae3
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/uapi/linux/netfilter/nf_tables.h
View File

@ -826,12 +826,14 @@ enum nft_meta_keys {
* @NFT_RT_NEXTHOP4: routing nexthop for IPv4 * @NFT_RT_NEXTHOP4: routing nexthop for IPv4
* @NFT_RT_NEXTHOP6: routing nexthop for IPv6 * @NFT_RT_NEXTHOP6: routing nexthop for IPv6
* @NFT_RT_TCPMSS: fetch current path tcp mss * @NFT_RT_TCPMSS: fetch current path tcp mss
* @NFT_RT_XFRM: boolean, skb->dst->xfrm != NULL
*/ */
enum nft_rt_keys { enum nft_rt_keys {
NFT_RT_CLASSID, NFT_RT_CLASSID,
NFT_RT_NEXTHOP4, NFT_RT_NEXTHOP4,
NFT_RT_NEXTHOP6, NFT_RT_NEXTHOP6,
NFT_RT_TCPMSS, NFT_RT_TCPMSS,
NFT_RT_XFRM,
__NFT_RT_MAX __NFT_RT_MAX
}; };
#define NFT_RT_MAX (__NFT_RT_MAX - 1) #define NFT_RT_MAX (__NFT_RT_MAX - 1)

11
net/netfilter/nft_rt.c
View File

@ -90,6 +90,11 @@ static void nft_rt_get_eval(const struct nft_expr *expr,
case NFT_RT_TCPMSS: case NFT_RT_TCPMSS:
nft_reg_store16(dest, get_tcpmss(pkt, dst)); nft_reg_store16(dest, get_tcpmss(pkt, dst));
break; break;
#ifdef CONFIG_XFRM
case NFT_RT_XFRM:
nft_reg_store8(dest, !!dst->xfrm);
break;
#endif
default: default:
WARN_ON(1); WARN_ON(1);
goto err; goto err;
@ -130,6 +135,11 @@ static int nft_rt_get_init(const struct nft_ctx *ctx,
case NFT_RT_TCPMSS: case NFT_RT_TCPMSS:
len = sizeof(u16); len = sizeof(u16);
break; break;
#ifdef CONFIG_XFRM
case NFT_RT_XFRM:
len = sizeof(u8);
break;
#endif
default: default:
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
@ -164,6 +174,7 @@ static int nft_rt_validate(const struct nft_ctx *ctx, const struct nft_expr *exp
case NFT_RT_NEXTHOP4: case NFT_RT_NEXTHOP4:
case NFT_RT_NEXTHOP6: case NFT_RT_NEXTHOP6:
case NFT_RT_CLASSID: case NFT_RT_CLASSID:
case NFT_RT_XFRM:
return 0; return 0;
case NFT_RT_TCPMSS: case NFT_RT_TCPMSS:
hooks = (1 << NF_INET_FORWARD) | hooks = (1 << NF_INET_FORWARD) |