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

Commit 984955b3 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by David S. Miller
Browse files

[NETFILTER]: ctnetlink: propagate ctnetlink_dump_tuples_proto return value back 



Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 90c4656e

net/ipv4/netfilter/ip_conntrack_netlink.c

+3 −2
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ ctnetlink_dump_tuples(struct sk_buff *skb, 
		      const struct ip_conntrack_tuple *tuple)

{

	struct nfattr *nest_parms;

	int ret;

	

	nest_parms = NFA_NEST(skb, CTA_TUPLE_IP);

	NFA_PUT(skb, CTA_IP_V4_SRC, sizeof(u_int32_t), &tuple->src.ip);
@@ -86,10 +87,10 @@ ctnetlink_dump_tuples(struct sk_buff *skb, 
	NFA_NEST_END(skb, nest_parms);



	nest_parms = NFA_NEST(skb, CTA_TUPLE_PROTO);

	ctnetlink_dump_tuples_proto(skb, tuple);

	ret = ctnetlink_dump_tuples_proto(skb, tuple);

	NFA_NEST_END(skb, nest_parms);



	return 0;

	return ret;



nfattr_failure:

	return -1;