diff options
author | Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp> | 2014-06-16 07:52:34 -0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-16 07:53:03 -0400 |
commit | 4a001068d790366bbf64ee927a363f752abafa71 (patch) | |
tree | 01f65470e4abc61dadbef6ce0a3a512fca0b3306 /net/netfilter | |
parent | 98ca74f4d5b44e58d926a38ae160f1ff9573687e (diff) |
netfilter: ctnetlink: add zone size to length
Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 70123f48b6c9..300ed1eec729 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c | |||
@@ -597,6 +597,9 @@ ctnetlink_nlmsg_size(const struct nf_conn *ct) | |||
597 | #ifdef CONFIG_NF_CONNTRACK_MARK | 597 | #ifdef CONFIG_NF_CONNTRACK_MARK |
598 | + nla_total_size(sizeof(u_int32_t)) /* CTA_MARK */ | 598 | + nla_total_size(sizeof(u_int32_t)) /* CTA_MARK */ |
599 | #endif | 599 | #endif |
600 | #ifdef CONFIG_NF_CONNTRACK_ZONES | ||
601 | + nla_total_size(sizeof(u_int16_t)) /* CTA_ZONE */ | ||
602 | #endif | ||
600 | + ctnetlink_proto_size(ct) | 603 | + ctnetlink_proto_size(ct) |
601 | + ctnetlink_label_size(ct) | 604 | + ctnetlink_label_size(ct) |
602 | ; | 605 | ; |
@@ -2040,6 +2043,9 @@ ctnetlink_nfqueue_build_size(const struct nf_conn *ct) | |||
2040 | #ifdef CONFIG_NF_CONNTRACK_MARK | 2043 | #ifdef CONFIG_NF_CONNTRACK_MARK |
2041 | + nla_total_size(sizeof(u_int32_t)) /* CTA_MARK */ | 2044 | + nla_total_size(sizeof(u_int32_t)) /* CTA_MARK */ |
2042 | #endif | 2045 | #endif |
2046 | #ifdef CONFIG_NF_CONNTRACK_ZONES | ||
2047 | + nla_total_size(sizeof(u_int16_t)) /* CTA_ZONE */ | ||
2048 | #endif | ||
2043 | + ctnetlink_proto_size(ct) | 2049 | + ctnetlink_proto_size(ct) |
2044 | ; | 2050 | ; |
2045 | } | 2051 | } |