diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-01-05 12:20:02 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-01-05 12:20:02 -0800 |
| commit | a9b305c4e56f97d6a2ae4f21691bc13797498caf (patch) | |
| tree | db6474b1b08573fc4d2e1c97aacdf60791623af3 | |
| parent | e7be6994ec68c38d8e23e647eac649b280c4fe5a (diff) | |
| download | kernel_samsung_smdk4412-a9b305c4e56f97d6a2ae4f21691bc13797498caf.zip kernel_samsung_smdk4412-a9b305c4e56f97d6a2ae4f21691bc13797498caf.tar.gz kernel_samsung_smdk4412-a9b305c4e56f97d6a2ae4f21691bc13797498caf.tar.bz2 | |
[NETFILTER]: ctnetlink: Fix dumping of helper name
Properly dump the helper name instead of internal kernel data.
Based on patch by Marcus Sundberg <marcus@ingate.com>.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -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 b8e9a5b..668ec94 100644 --- a/include/linux/netfilter/nfnetlink_conntrack.h +++ b/include/linux/netfilter/nfnetlink_conntrack.h @@ -131,6 +131,4 @@ enum ctattr_help { }; #define CTA_HELP_MAX (__CTA_HELP_MAX - 1) -#define CTA_HELP_MAXNAMESIZE 32 - #endif /* _IPCONNTRACK_NETLINK_H */ diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c index 703f2d2..c9ebbe0 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) return 0; nest_helper = NFA_NEST(skb, CTA_HELP); - NFA_PUT(skb, CTA_HELP_NAME, CTA_HELP_MAXNAMESIZE, &ct->helper->name); + NFA_PUT(skb, CTA_HELP_NAME, strlen(ct->helper->name), ct->helper->name); if (ct->helper->to_nfattr) ct->helper->to_nfattr(skb, ct); |