Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9b305c4 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[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: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e7be6994

include/linux/netfilter/nfnetlink_conntrack.h

+0 −2
Original line number Diff line number Diff line
@@ -131,6 +131,4 @@ enum ctattr_help { 
};

#define CTA_HELP_MAX (__CTA_HELP_MAX - 1)



#define CTA_HELP_MAXNAMESIZE	32



#endif /* _IPCONNTRACK_NETLINK_H */

net/ipv4/netfilter/ip_conntrack_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -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);