diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-03-06 21:36:25 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-06 21:36:25 -0800 |
| commit | 357ddbb9bf4813e48f5aa7836b6606c05f6e5788 (patch) | |
| tree | 4696070f503d1bf944a1df5722d1c923795d9b87 /net/netfilter/nfnetlink_cthelper.c | |
| parent | mptcp: always include dack if possible. (diff) | |
| parent | netfilter: nft_chain_nat: inet family is missing module ownership (diff) | |
| download | linux-dev-357ddbb9bf4813e48f5aa7836b6606c05f6e5788.tar.xz linux-dev-357ddbb9bf4813e48f5aa7836b6606c05f6e5788.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 net:
1) Patches to bump position index from sysctl seq_next,
from Vasilin Averin.
2) Release flowtable hook from error path, from Florian Westphal.
3) Patches to add missing netlink attribute validation,
from Jakub Kicinski.
4) Missing NFTA_CHAIN_FLAGS in nf_tables_fill_chain_info().
5) Infinite loop in module autoload if extension is not available,
from Florian Westphal.
6) Missing module ownership in inet/nat chain type definition.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nfnetlink_cthelper.c')
| -rw-r--r-- | net/netfilter/nfnetlink_cthelper.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c index de3a9596b7f1..a5f294aa8e4c 100644 --- a/net/netfilter/nfnetlink_cthelper.c +++ b/net/netfilter/nfnetlink_cthelper.c @@ -742,6 +742,8 @@ static const struct nla_policy nfnl_cthelper_policy[NFCTH_MAX+1] = { [NFCTH_NAME] = { .type = NLA_NUL_STRING, .len = NF_CT_HELPER_NAME_LEN-1 }, [NFCTH_QUEUE_NUM] = { .type = NLA_U32, }, + [NFCTH_PRIV_DATA_LEN] = { .type = NLA_U32, }, + [NFCTH_STATUS] = { .type = NLA_U32, }, }; static const struct nfnl_callback nfnl_cthelper_cb[NFNL_MSG_CTHELPER_MAX] = { |