Merge tag 'fbdev-fixes-for-3.5-2' of git://github.com/schandinat/linux-2.6

[deliverable/linux.git] / net / netfilter / nf_conntrack_proto_generic.c

diff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c
index 835e24c58f0de3ab67977aad017d456a840e28ce..d8923d54b3585bf579c66eaba82dc4ec7d464236 100644 (file)
--- a/net/netfilter/nf_conntrack_proto_generic.c
+++ b/net/netfilter/nf_conntrack_proto_generic.c
@@ -90,7 +90,8 @@ generic_timeout_obj_to_nlattr(struct sk_buff *skb, const void *data)
 {
        const unsigned int *timeout = data;
 
-       NLA_PUT_BE32(skb, CTA_TIMEOUT_GENERIC_TIMEOUT, htonl(*timeout / HZ));
+       if (nla_put_be32(skb, CTA_TIMEOUT_GENERIC_TIMEOUT, htonl(*timeout / HZ)))
+               goto nla_put_failure;
 
        return 0;