Merge tag 'for-linus-20120706' of git://git.infradead.org/linux-mtd

[~andy/linux] / net / netfilter / nf_conntrack_proto_dccp.c

diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c
index 24fdce256cb0a65ee9996dfa7fa2569e499eebd0..ef706a485be11d79f84df30b253af5b477542127 100644 (file)
--- a/net/netfilter/nf_conntrack_proto_dccp.c
+++ b/net/netfilter/nf_conntrack_proto_dccp.c
@@ -643,11 +643,12 @@ static int dccp_to_nlattr(struct sk_buff *skb, struct nlattr *nla,
        nest_parms = nla_nest_start(skb, CTA_PROTOINFO_DCCP | NLA_F_NESTED);
        if (!nest_parms)
                goto nla_put_failure;
-       NLA_PUT_U8(skb, CTA_PROTOINFO_DCCP_STATE, ct->proto.dccp.state);
-       NLA_PUT_U8(skb, CTA_PROTOINFO_DCCP_ROLE,
-                  ct->proto.dccp.role[IP_CT_DIR_ORIGINAL]);
-       NLA_PUT_BE64(skb, CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ,
-                    cpu_to_be64(ct->proto.dccp.handshake_seq));
+       if (nla_put_u8(skb, CTA_PROTOINFO_DCCP_STATE, ct->proto.dccp.state) ||
+           nla_put_u8(skb, CTA_PROTOINFO_DCCP_ROLE,
+                      ct->proto.dccp.role[IP_CT_DIR_ORIGINAL]) ||
+           nla_put_be64(skb, CTA_PROTOINFO_DCCP_HANDSHAKE_SEQ,
+                        cpu_to_be64(ct->proto.dccp.handshake_seq)))
+               goto nla_put_failure;
        nla_nest_end(skb, nest_parms);
        spin_unlock_bh(&ct->lock);
        return 0;
@@ -739,9 +740,10 @@ dccp_timeout_obj_to_nlattr(struct sk_buff *skb, const void *data)
         const unsigned int *timeouts = data;
        int i;
 
-       for (i=CTA_TIMEOUT_DCCP_UNSPEC+1; i<CTA_TIMEOUT_DCCP_MAX+1; i++)
-               NLA_PUT_BE32(skb, i, htonl(timeouts[i] / HZ));
-
+       for (i=CTA_TIMEOUT_DCCP_UNSPEC+1; i<CTA_TIMEOUT_DCCP_MAX+1; i++) {
+               if (nla_put_be32(skb, i, htonl(timeouts[i] / HZ)))
+                       goto nla_put_failure;
+       }
        return 0;
 
 nla_put_failure:
@@ -908,8 +910,8 @@ static __net_init int dccp_net_init(struct net *net)
        dn->sysctl_table[6].data = &dn->dccp_timeout[CT_DCCP_TIMEWAIT];
        dn->sysctl_table[7].data = &dn->dccp_loose;
 
-       dn->sysctl_header = register_net_sysctl_table(net,
-                       nf_net_netfilter_sysctl_path, dn->sysctl_table);
+       dn->sysctl_header = register_net_sysctl(net, "net/netfilter",
+                                               dn->sysctl_table);
        if (!dn->sysctl_header) {
                kfree(dn->sysctl_table);
                return -ENOMEM;