]> git.baikalelectronics.ru Git - kernel.git/commit
netfilter: nft_ct: labels get support
authorFlorian Westphal <fw@strlen.de>
Tue, 18 Feb 2014 14:25:32 +0000 (15:25 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 19 Feb 2014 10:41:25 +0000 (11:41 +0100)
commit0bd228d36ee29983c7b98b54f01864996e7a1a71
tree886fd9d2a812e9c6ecb5c90a08abf1a7fb1e6b56
parent312d4d34efcb9d9aa7deb03a8c94d7d2325ce3fb
netfilter: nft_ct: labels get support

This also adds NF_CT_LABELS_MAX_SIZE so it can be re-used
as BUILD_BUG_ON in nft_ct.

At this time, nft doesn't yet support writing to the label area;
when this changes the label->words handling needs to be moved
out of xt_connlabel.c into nf_conntrack_labels.c.

Also removes a useless run-time check: words cannot grow beyond
4 (32 bit) or 2 (64bit) since xt_connlabel enforces a maximum of
128 labels.

Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/net/netfilter/nf_conntrack_labels.h
include/uapi/linux/netfilter/nf_tables.h
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nft_ct.c