netfilter: add support for matching IPv4 options
Subsystems (4)
PATCH v2 1/1 netfilter: add support for matching IPv4 options
This is the kernel change for the overall changes with this description:
Add capability to have rules matching IPv4 options. This is developed mainly to support dropping of IP packets with loose and/or strict source route route options. Nevertheless, the implementation include others and ability to get specific fields in the option.
v2: Fix style issues. Make this work with NFPROTO_INET (inet tables),
NFPROTO_BRIDGE and the NFPROTO_NETDEV families. Check skb->protocol. Remove ability to input IP header offset for ipv4_find_option() function (all per Pablo Neira Ayuso).
Signed-off-by Stephen Suryaputra <[email protected]>
--- include/net/inet_sock.h | 2 +- include/uapi/linux/netfilter/nf_tables.h | 2 + net/ipv4/ip_options.c | 2 + net/netfilter/nft_exthdr.c | 133 +++++++++++++++++++++++ 4 files changed, 138 insertions(+), 1 deletion(-)
include/net/inet_sock.h +1 -1
@@ -55,7 +55,7 @@ struct ip_options { ts_needaddr:1 ;unsigned char router_alert;unsigned char cipso; -unsigned char __pad2; +unsigned char end;unsigned char __data[0 ]; };
include/uapi/linux/netfilter/nf_tables.h +2 -0
@@ -730,10 +730,12 @@ enum nft_exthdr_flags {* * @NFT_EXTHDR_OP_IPV6: match against ipv6 extension headers * @NFT_EXTHDR_OP_TCP: match against tcp options +* @NFT_EXTHDR_OP_IPV4: match against ipv4 options */ enum nft_exthdr_op {NFT_EXTHDR_OP_IPV6 ,NFT_EXTHDR_OP_TCPOPT , +NFT_EXTHDR_OP_IPV4 , __NFT_EXTHDR_OP_MAX };#define NFT_EXTHDR_OP_MAX (__NFT_EXTHDR_OP_MAX - 1)
net/ipv4/ip_options.c +2 -0
@@ -272,6 +272,7 @@ int __ip_options_compile(struct net *net,for (l = opt->optlen; l >0 ; ) {switch (*optptr) {case IPOPT_END : + opt->end = optptr - iph;for (optptr++, l--; l >0 ; optptr++, l--) {if (*optptr !=IPOPT_END ) { *optptr =IPOPT_END ;
@@ -473,6 +474,7 @@ int __ip_options_compile(struct net *net, *info =htonl ((pp_ptr-iph)<<24 );return -EINVAL ; } +EXPORT_SYMBOL (__ip_options_compile);int ip_options_compile (struct net *net,struct ip_options *opt,struct sk_buff *skb)
net/netfilter/nft_exthdr.c +133 -0
151 lines not on this page · raw message
Signature · 1 line
2.17.1