From 170b427455d190a10ab5a9157bd231886bdeb1ef Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 1 Apr 2012 18:52:03 -0400 Subject: [PATCH] --- yaml --- r: 300391 b: refs/heads/master c: 242ddfc01499e83cd1e65e1dddb8c96b7f2ba2cc h: refs/heads/master i: 300389: 96e9ea29e7d6b1adba0c9940c602ff2534bf34cb 300387: 612df312abbae251f6d91f0f27751b40cbead9d6 300383: 7f5960bdb111f905bd8fece5d25a91f5c141ab64 v: v3 --- [refs] | 2 +- trunk/net/netfilter/nf_conntrack_proto_gre.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ea86c7e989e9..b1bb34ffb5ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e8d1eb5fb51e5b9d266a611133fea808320ab97 +refs/heads/master: 242ddfc01499e83cd1e65e1dddb8c96b7f2ba2cc diff --git a/trunk/net/netfilter/nf_conntrack_proto_gre.c b/trunk/net/netfilter/nf_conntrack_proto_gre.c index 659648c4b14a..4bf6b4e4b776 100644 --- a/trunk/net/netfilter/nf_conntrack_proto_gre.c +++ b/trunk/net/netfilter/nf_conntrack_proto_gre.c @@ -321,10 +321,11 @@ gre_timeout_obj_to_nlattr(struct sk_buff *skb, const void *data) { const unsigned int *timeouts = data; - NLA_PUT_BE32(skb, CTA_TIMEOUT_GRE_UNREPLIED, - htonl(timeouts[GRE_CT_UNREPLIED] / HZ)); - NLA_PUT_BE32(skb, CTA_TIMEOUT_GRE_REPLIED, - htonl(timeouts[GRE_CT_REPLIED] / HZ)); + if (nla_put_be32(skb, CTA_TIMEOUT_GRE_UNREPLIED, + htonl(timeouts[GRE_CT_UNREPLIED] / HZ)) || + nla_put_be32(skb, CTA_TIMEOUT_GRE_REPLIED, + htonl(timeouts[GRE_CT_REPLIED] / HZ))) + goto nla_put_failure; return 0; nla_put_failure: