From 86e3ca8b556d58ba2b1ce844d72244e0aacbbada Mon Sep 17 00:00:00 2001 From: Madalin Bucur Date: Mon, 26 Sep 2011 07:04:36 +0000 Subject: [PATCH] --- yaml --- r: 264165 b: refs/heads/master c: d4cae56219755ccf8acfc8e2c1927009ff29d8c6 h: refs/heads/master i: 264163: 3aeae0ba185c92285a3b67c40d5f9457c30b7e92 v: v3 --- [refs] | 2 +- trunk/net/xfrm/xfrm_policy.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index eeeff760d7c5..4f0fd8b6f298 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2015de5fe2a47086a3260802275932bfd810884e +refs/heads/master: d4cae56219755ccf8acfc8e2c1927009ff29d8c6 diff --git a/trunk/net/xfrm/xfrm_policy.c b/trunk/net/xfrm/xfrm_policy.c index 94fdcc7f1030..552df27dcf53 100644 --- a/trunk/net/xfrm/xfrm_policy.c +++ b/trunk/net/xfrm/xfrm_policy.c @@ -1349,14 +1349,16 @@ static inline struct xfrm_dst *xfrm_alloc_dst(struct net *net, int family) BUG(); } xdst = dst_alloc(dst_ops, NULL, 0, 0, 0); - memset(&xdst->u.rt6.rt6i_table, 0, sizeof(*xdst) - sizeof(struct dst_entry)); - xfrm_policy_put_afinfo(afinfo); - if (likely(xdst)) + if (likely(xdst)) { + memset(&xdst->u.rt6.rt6i_table, 0, + sizeof(*xdst) - sizeof(struct dst_entry)); xdst->flo.ops = &xfrm_bundle_fc_ops; - else + } else xdst = ERR_PTR(-ENOBUFS); + xfrm_policy_put_afinfo(afinfo); + return xdst; }