netfilter: ipv6: Stop using NLA_PUT*().

[deliverable/linux.git] / net / ipv6 / netfilter / nf_conntrack_l3proto_ipv6.c

diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index 4111050a9fc524e0cd225aa81d5dfa4c4e166d06..fe925e492520c5d0ec8226618bfd84d828ebab08 100644 (file)
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -278,10 +278,11 @@ static struct nf_hook_ops ipv6_conntrack_ops[] __read_mostly = {
 static int ipv6_tuple_to_nlattr(struct sk_buff *skb,
                                const struct nf_conntrack_tuple *tuple)
 {
-       NLA_PUT(skb, CTA_IP_V6_SRC, sizeof(u_int32_t) * 4,
-               &tuple->src.u3.ip6);
-       NLA_PUT(skb, CTA_IP_V6_DST, sizeof(u_int32_t) * 4,
-               &tuple->dst.u3.ip6);
+       if (nla_put(skb, CTA_IP_V6_SRC, sizeof(u_int32_t) * 4,
+                   &tuple->src.u3.ip6) ||
+           nla_put(skb, CTA_IP_V6_DST, sizeof(u_int32_t) * 4,
+                   &tuple->dst.u3.ip6))
+               goto nla_put_failure;
        return 0;
 
 nla_put_failure: