diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-10 14:54:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-10 14:54:27 -0700 |
| commit | 293fddff20cd6d1adf2bd59cda1f5b5e7199104a (patch) | |
| tree | 07e28c5a33d8304a4c7cfbfd953878f89f165ef5 /include | |
| parent | 7bb90c3715a496c650b2e879225030f9dd9cfafb (diff) | |
| parent | 4da449ae1df9cfeb167e78f250b250eff64bc65e (diff) | |
| download | linux-293fddff20cd6d1adf2bd59cda1f5b5e7199104a.tar.gz linux-293fddff20cd6d1adf2bd59cda1f5b5e7199104a.tar.bz2 linux-293fddff20cd6d1adf2bd59cda1f5b5e7199104a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for your net tree,
they are:
1) Use mod_timer_pending() to avoid reactivating a dead expectation in
the h323 conntrack helper, from Liping Zhang.
2) Oneliner to fix a type in the register name defined in the nf_tables
header.
3) Don't try to look further when we find an inactive elements with no
descendants in the rbtree set implementation, otherwise we crash.
4) Handle valid zero CSeq in the SIP conntrack helper, from
Christophe Leroy.
5) Don't display a trailing slash in conntrack helper with no classes
via /proc/net/nf_conntrack_expect, from Liping Zhang.
6) Fix an expectation leak during creation from the nfqueue path, again
from Liping Zhang.
7) Validate netlink port ID in verdict message from nfqueue, otherwise
an injection can be possible. Again from Zhang.
8) Reject conntrack tuples with different transport protocol on
original and reply tuples, also from Zhang.
9) Validate offset and length in nft_exthdr, make sure they are under
sizeof(u8), from Laura Garcia Liebana.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/netfilter/nf_tables.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h index 01751faccaf8..c674ba2563b7 100644 --- a/include/uapi/linux/netfilter/nf_tables.h +++ b/include/uapi/linux/netfilter/nf_tables.h @@ -24,7 +24,7 @@ enum nft_registers { __NFT_REG_MAX, NFT_REG32_00 = 8, - MFT_REG32_01, + NFT_REG32_01, NFT_REG32_02, NFT_REG32_03, NFT_REG32_04, |