diff options
| author | Patrick McHardy <kaber@trash.net> | 2013-10-14 05:00:02 -0400 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-10-14 11:15:48 -0400 |
| commit | 96518518cc417bb0a8c80b9fb736202e28acdf96 (patch) | |
| tree | 2ac4f939a88f0a8047403d0e07b5167369236f82 /include/uapi/linux | |
| parent | f59cb0453cd885736daa11ae2445982c5ab2fc83 (diff) | |
netfilter: add nftables
This patch adds nftables which is the intended successor of iptables.
This packet filtering framework reuses the existing netfilter hooks,
the connection tracking system, the NAT subsystem, the transparent
proxying engine, the logging infrastructure and the userspace packet
queueing facilities.
In a nutshell, nftables provides a pseudo-state machine with 4 general
purpose registers of 128 bits and 1 specific purpose register to store
verdicts. This pseudo-machine comes with an extensible instruction set,
a.k.a. "expressions" in the nftables jargon. The expressions included
in this patch provide the basic functionality, they are:
* bitwise: to perform bitwise operations.
* byteorder: to change from host/network endianess.
* cmp: to compare data with the content of the registers.
* counter: to enable counters on rules.
* ct: to store conntrack keys into register.
* exthdr: to match IPv6 extension headers.
* immediate: to load data into registers.
* limit: to limit matching based on packet rate.
* log: to log packets.
* meta: to match metainformation that usually comes with the skbuff.
* nat: to perform Network Address Translation.
* payload: to fetch data from the packet payload and store it into
registers.
* reject (IPv4 only): to explicitly close connection, eg. TCP RST.
Using this instruction-set, the userspace utility 'nft' can transform
the rules expressed in human-readable text representation (using a
new syntax, inspired by tcpdump) to nftables bytecode.
nftables also inherits the table, chain and rule objects from
iptables, but in a more configurable way, and it also includes the
original datatype-agnostic set infrastructure with mapping support.
This set infrastructure is enhanced in the follow up patch (netfilter:
nf_tables: add netlink set API).
This patch includes the following components:
* the netlink API: net/netfilter/nf_tables_api.c and
include/uapi/netfilter/nf_tables.h
* the packet filter core: net/netfilter/nf_tables_core.c
* the expressions (described above): net/netfilter/nft_*.c
* the filter tables: arp, IPv4, IPv6 and bridge:
net/ipv4/netfilter/nf_tables_ipv4.c
net/ipv6/netfilter/nf_tables_ipv6.c
net/ipv4/netfilter/nf_tables_arp.c
net/bridge/netfilter/nf_tables_bridge.c
* the NAT table (IPv4 only):
net/ipv4/netfilter/nf_table_nat_ipv4.c
* the route table (similar to mangle):
net/ipv4/netfilter/nf_table_route_ipv4.c
net/ipv6/netfilter/nf_table_route_ipv6.c
* internal definitions under:
include/net/netfilter/nf_tables.h
include/net/netfilter/nf_tables_core.h
* It also includes an skeleton expression:
net/netfilter/nft_expr_template.c
and the preliminary implementation of the meta target
net/netfilter/nft_meta_target.c
It also includes a change in struct nf_hook_ops to add a new
pointer to store private data to the hook, that is used to store
the rule list per chain.
This patch is based on the patch from Patrick McHardy, plus merged
accumulated cleanups, fixes and small enhancements to the nftables
code that has been done since 2009, which are:
From Patrick McHardy:
* nf_tables: adjust netlink handler function signatures
* nf_tables: only retry table lookup after successful table module load
* nf_tables: fix event notification echo and avoid unnecessary messages
* nft_ct: add l3proto support
* nf_tables: pass expression context to nft_validate_data_load()
* nf_tables: remove redundant definition
* nft_ct: fix maxattr initialization
* nf_tables: fix invalid event type in nf_tables_getrule()
* nf_tables: simplify nft_data_init() usage
* nf_tables: build in more core modules
* nf_tables: fix double lookup expression unregistation
* nf_tables: move expression initialization to nf_tables_core.c
* nf_tables: build in payload module
* nf_tables: use NFPROTO constants
* nf_tables: rename pid variables to portid
* nf_tables: save 48 bits per rule
* nf_tables: introduce chain rename
* nf_tables: check for duplicate names on chain rename
* nf_tables: remove ability to specify handles for new rules
* nf_tables: return error for rule change request
* nf_tables: return error for NLM_F_REPLACE without rule handle
* nf_tables: include NLM_F_APPEND/NLM_F_REPLACE flags in rule notification
* nf_tables: fix NLM_F_MULTI usage in netlink notifications
* nf_tables: include NLM_F_APPEND in rule dumps
From Pablo Neira Ayuso:
* nf_tables: fix stack overflow in nf_tables_newrule
* nf_tables: nft_ct: fix compilation warning
* nf_tables: nft_ct: fix crash with invalid packets
* nft_log: group and qthreshold are 2^16
* nf_tables: nft_meta: fix socket uid,gid handling
* nft_counter: allow to restore counters
* nf_tables: fix module autoload
* nf_tables: allow to remove all rules placed in one chain
* nf_tables: use 64-bits rule handle instead of 16-bits
* nf_tables: fix chain after rule deletion
* nf_tables: improve deletion performance
* nf_tables: add missing code in route chain type
* nf_tables: rise maximum number of expressions from 12 to 128
* nf_tables: don't delete table if in use
* nf_tables: fix basechain release
From Tomasz Bursztyka:
* nf_tables: Add support for changing users chain's name
* nf_tables: Change chain's name to be fixed sized
* nf_tables: Add support for replacing a rule by another one
* nf_tables: Update uapi nftables netlink header documentation
From Florian Westphal:
* nft_log: group is u16, snaplen u32
From Phil Oester:
* nf_tables: operational limit match
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/netfilter/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nf_conntrack_common.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nf_tables.h | 582 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/nfnetlink.h | 5 |
4 files changed, 591 insertions, 1 deletions
diff --git a/include/uapi/linux/netfilter/Kbuild b/include/uapi/linux/netfilter/Kbuild index 174915420d3f..6ce0b7f566a7 100644 --- a/include/uapi/linux/netfilter/Kbuild +++ b/include/uapi/linux/netfilter/Kbuild | |||
| @@ -5,6 +5,7 @@ header-y += nf_conntrack_ftp.h | |||
| 5 | header-y += nf_conntrack_sctp.h | 5 | header-y += nf_conntrack_sctp.h |
| 6 | header-y += nf_conntrack_tcp.h | 6 | header-y += nf_conntrack_tcp.h |
| 7 | header-y += nf_conntrack_tuple_common.h | 7 | header-y += nf_conntrack_tuple_common.h |
| 8 | header-y += nf_tables.h | ||
| 8 | header-y += nf_nat.h | 9 | header-y += nf_nat.h |
| 9 | header-y += nfnetlink.h | 10 | header-y += nfnetlink.h |
| 10 | header-y += nfnetlink_acct.h | 11 | header-y += nfnetlink_acct.h |
diff --git a/include/uapi/linux/netfilter/nf_conntrack_common.h b/include/uapi/linux/netfilter/nf_conntrack_common.h index 8dd803818ebe..319f47128db8 100644 --- a/include/uapi/linux/netfilter/nf_conntrack_common.h +++ b/include/uapi/linux/netfilter/nf_conntrack_common.h | |||
| @@ -25,6 +25,10 @@ enum ip_conntrack_info { | |||
| 25 | IP_CT_NUMBER = IP_CT_IS_REPLY * 2 - 1 | 25 | IP_CT_NUMBER = IP_CT_IS_REPLY * 2 - 1 |
| 26 | }; | 26 | }; |
| 27 | 27 | ||
| 28 | #define NF_CT_STATE_INVALID_BIT (1 << 0) | ||
| 29 | #define NF_CT_STATE_BIT(ctinfo) (1 << ((ctinfo) % IP_CT_IS_REPLY + 1)) | ||
| 30 | #define NF_CT_STATE_UNTRACKED_BIT (1 << (IP_CT_NUMBER + 1)) | ||
| 31 | |||
| 28 | /* Bitset representing status of connection. */ | 32 | /* Bitset representing status of connection. */ |
| 29 | enum ip_conntrack_status { | 33 | enum ip_conntrack_status { |
| 30 | /* It's an expected connection: bit 0 set. This bit never changed */ | 34 | /* It's an expected connection: bit 0 set. This bit never changed */ |
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h new file mode 100644 index 000000000000..ec6d84a8ed1e --- /dev/null +++ b/include/uapi/linux/netfilter/nf_tables.h | |||
| @@ -0,0 +1,582 @@ | |||
| 1 | #ifndef _LINUX_NF_TABLES_H | ||
| 2 | #define _LINUX_NF_TABLES_H | ||
| 3 | |||
| 4 | #define NFT_CHAIN_MAXNAMELEN 32 | ||
| 5 | |||
| 6 | enum nft_registers { | ||
| 7 | NFT_REG_VERDICT, | ||
| 8 | NFT_REG_1, | ||
| 9 | NFT_REG_2, | ||
| 10 | NFT_REG_3, | ||
| 11 | NFT_REG_4, | ||
| 12 | __NFT_REG_MAX | ||
| 13 | }; | ||
| 14 | #define NFT_REG_MAX (__NFT_REG_MAX - 1) | ||
| 15 | |||
| 16 | /** | ||
| 17 | * enum nft_verdicts - nf_tables internal verdicts | ||
| 18 | * | ||
| 19 | * @NFT_CONTINUE: continue evaluation of the current rule | ||
| 20 | * @NFT_BREAK: terminate evaluation of the current rule | ||
| 21 | * @NFT_JUMP: push the current chain on the jump stack and jump to a chain | ||
| 22 | * @NFT_GOTO: jump to a chain without pushing the current chain on the jump stack | ||
| 23 | * @NFT_RETURN: return to the topmost chain on the jump stack | ||
| 24 | * | ||
| 25 | * The nf_tables verdicts share their numeric space with the netfilter verdicts. | ||
| 26 | */ | ||
| 27 | enum nft_verdicts { | ||
| 28 | NFT_CONTINUE = -1, | ||
| 29 | NFT_BREAK = -2, | ||
| 30 | NFT_JUMP = -3, | ||
| 31 | NFT_GOTO = -4, | ||
| 32 | NFT_RETURN = -5, | ||
| 33 | }; | ||
| 34 | |||
| 35 | /** | ||
| 36 | * enum nf_tables_msg_types - nf_tables netlink message types | ||
| 37 | * | ||
| 38 | * @NFT_MSG_NEWTABLE: create a new table (enum nft_table_attributes) | ||
| 39 | * @NFT_MSG_GETTABLE: get a table (enum nft_table_attributes) | ||
| 40 | * @NFT_MSG_DELTABLE: delete a table (enum nft_table_attributes) | ||
| 41 | * @NFT_MSG_NEWCHAIN: create a new chain (enum nft_chain_attributes) | ||
| 42 | * @NFT_MSG_GETCHAIN: get a chain (enum nft_chain_attributes) | ||
| 43 | * @NFT_MSG_DELCHAIN: delete a chain (enum nft_chain_attributes) | ||
| 44 | * @NFT_MSG_NEWRULE: create a new rule (enum nft_rule_attributes) | ||
| 45 | * @NFT_MSG_GETRULE: get a rule (enum nft_rule_attributes) | ||
| 46 | * @NFT_MSG_DELRULE: delete a rule (enum nft_rule_attributes) | ||
| 47 | */ | ||
| 48 | enum nf_tables_msg_types { | ||
| 49 | NFT_MSG_NEWTABLE, | ||
| 50 | NFT_MSG_GETTABLE, | ||
| 51 | NFT_MSG_DELTABLE, | ||
| 52 | NFT_MSG_NEWCHAIN, | ||
| 53 | NFT_MSG_GETCHAIN, | ||
| 54 | NFT_MSG_DELCHAIN, | ||
| 55 | NFT_MSG_NEWRULE, | ||
| 56 | NFT_MSG_GETRULE, | ||
| 57 | NFT_MSG_DELRULE, | ||
| 58 | NFT_MSG_MAX, | ||
| 59 | }; | ||
| 60 | |||
| 61 | enum nft_list_attributes { | ||
| 62 | NFTA_LIST_UNPEC, | ||
| 63 | NFTA_LIST_ELEM, | ||
| 64 | __NFTA_LIST_MAX | ||
| 65 | }; | ||
| 66 | #define NFTA_LIST_MAX (__NFTA_LIST_MAX - 1) | ||
| 67 | |||
| 68 | /** | ||
| 69 | * enum nft_hook_attributes - nf_tables netfilter hook netlink attributes | ||
| 70 | * | ||
| 71 | * @NFTA_HOOK_HOOKNUM: netfilter hook number (NLA_U32) | ||
| 72 | * @NFTA_HOOK_PRIORITY: netfilter hook priority (NLA_U32) | ||
| 73 | */ | ||
| 74 | enum nft_hook_attributes { | ||
| 75 | NFTA_HOOK_UNSPEC, | ||
| 76 | NFTA_HOOK_HOOKNUM, | ||
| 77 | NFTA_HOOK_PRIORITY, | ||
| 78 | __NFTA_HOOK_MAX | ||
| 79 | }; | ||
| 80 | #define NFTA_HOOK_MAX (__NFTA_HOOK_MAX - 1) | ||
| 81 | |||
| 82 | /** | ||
| 83 | * enum nft_table_attributes - nf_tables table netlink attributes | ||
| 84 | * | ||
| 85 | * @NFTA_TABLE_NAME: name of the table (NLA_STRING) | ||
| 86 | */ | ||
| 87 | enum nft_table_attributes { | ||
| 88 | NFTA_TABLE_UNSPEC, | ||
| 89 | NFTA_TABLE_NAME, | ||
| 90 | __NFTA_TABLE_MAX | ||
| 91 | }; | ||
| 92 | #define NFTA_TABLE_MAX (__NFTA_TABLE_MAX - 1) | ||
| 93 | |||
| 94 | /** | ||
| 95 | * enum nft_chain_attributes - nf_tables chain netlink attributes | ||
| 96 | * | ||
| 97 | * @NFTA_CHAIN_TABLE: name of the table containing the chain (NLA_STRING) | ||
| 98 | * @NFTA_CHAIN_HANDLE: numeric handle of the chain (NLA_U64) | ||
| 99 | * @NFTA_CHAIN_NAME: name of the chain (NLA_STRING) | ||
| 100 | * @NFTA_CHAIN_HOOK: hook specification for basechains (NLA_NESTED: nft_hook_attributes) | ||
| 101 | */ | ||
| 102 | enum nft_chain_attributes { | ||
| 103 | NFTA_CHAIN_UNSPEC, | ||
| 104 | NFTA_CHAIN_TABLE, | ||
| 105 | NFTA_CHAIN_HANDLE, | ||
| 106 | NFTA_CHAIN_NAME, | ||
| 107 | NFTA_CHAIN_HOOK, | ||
| 108 | __NFTA_CHAIN_MAX | ||
| 109 | }; | ||
| 110 | #define NFTA_CHAIN_MAX (__NFTA_CHAIN_MAX - 1) | ||
| 111 | |||
| 112 | /** | ||
| 113 | * enum nft_rule_attributes - nf_tables rule netlink attributes | ||
| 114 | * | ||
| 115 | * @NFTA_RULE_TABLE: name of the table containing the rule (NLA_STRING) | ||
| 116 | * @NFTA_RULE_CHAIN: name of the chain containing the rule (NLA_STRING) | ||
| 117 | * @NFTA_RULE_HANDLE: numeric handle of the rule (NLA_U64) | ||
| 118 | * @NFTA_RULE_EXPRESSIONS: list of expressions (NLA_NESTED: nft_expr_attributes) | ||
| 119 | */ | ||
| 120 | enum nft_rule_attributes { | ||
| 121 | NFTA_RULE_UNSPEC, | ||
| 122 | NFTA_RULE_TABLE, | ||
| 123 | NFTA_RULE_CHAIN, | ||
| 124 | NFTA_RULE_HANDLE, | ||
| 125 | NFTA_RULE_EXPRESSIONS, | ||
| 126 | __NFTA_RULE_MAX | ||
| 127 | }; | ||
| 128 | #define NFTA_RULE_MAX (__NFTA_RULE_MAX - 1) | ||
| 129 | |||
| 130 | enum nft_data_attributes { | ||
| 131 | NFTA_DATA_UNSPEC, | ||
| 132 | NFTA_DATA_VALUE, | ||
| < | |||
