diff options
-rw-r--r-- | include/linux/netfilter/nfnetlink_conntrack.h | 2 | ||||
-rw-r--r-- | net/ipv4/netfilter/ip_conntrack_netlink.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/netfilter/nfnetlink_conntrack.h b/include/linux/netfilter/nfnetlink_conntrack.h index b8e9a5b6fb1e..668ec946c8e2 100644 --- a/include/linux/netfilter/nfnetlink_conntrack.h +++ b/include/linux/netfilter/nfnetlink_conntrack.h | |||
@@ -131,6 +131,4 @@ enum ctattr_help { | |||
131 | }; | 131 | }; |
132 | #define CTA_HELP_MAX (__CTA_HELP_MAX - 1) | 132 | #define CTA_HELP_MAX (__CTA_HELP_MAX - 1) |
133 | 133 | ||
134 | #define CTA_HELP_MAXNAMESIZE 32 | ||
135 | |||
136 | #endif /* _IPCONNTRACK_NETLINK_H */ | 134 | #endif /* _IPCONNTRACK_NETLINK_H */ |
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c index 703f2d2e3464..c9ebbe0d2d9c 100644 --- a/net/ipv4/netfilter/ip_conntrack_netlink.c +++ b/net/ipv4/netfilter/ip_conntrack_netlink.c | |||
@@ -161,7 +161,7 @@ ctnetlink_dump_helpinfo(struct sk_buff *skb, const struct ip_conntrack *ct) | |||
161 | return 0; | 161 | return 0; |
162 | 162 | ||
163 | nest_helper = NFA_NEST(skb, CTA_HELP); | 163 | nest_helper = NFA_NEST(skb, CTA_HELP); |
164 | NFA_PUT(skb, CTA_HELP_NAME, CTA_HELP_MAXNAMESIZE, &ct->helper->name); | 164 | NFA_PUT(skb, CTA_HELP_NAME, strlen(ct->helper->name), ct->helper->name); |
165 | 165 | ||
166 | if (ct->helper->to_nfattr) | 166 | if (ct->helper->to_nfattr) |
167 | ct->helper->to_nfattr(skb, ct); | 167 | ct->helper->to_nfattr(skb, ct); |