From 114c29cc7cd2b99618491dc8eade808620b42bd0 Mon Sep 17 00:00:00 2001
From: Hiroaki SHIMODA <shimoda.hiroaki@gmail.com>
Date: Thu, 10 Feb 2011 23:08:33 -0800
Subject: [PATCH] --- yaml --- r: 233415 b: refs/heads/master c:
 0b150932197b185ad5816932912e648116c7a96a h: refs/heads/master i:   233413:
 eefb598119c9d186ec5843e6dc04292b25a3feeb   233411:
 4f4cb7971aa0686a14b7e97370e8e5648acc2eb3   233407:
 8d26aa898457e801b27bae572ae420322b5a9f77 v: v3

---
 [refs]                       | 2 +-
 trunk/net/xfrm/xfrm_policy.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7342e02d630c..10ad396f1ea5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 520732af9158308e96245b54f1d573861eafb631
+refs/heads/master: 0b150932197b185ad5816932912e648116c7a96a
diff --git a/trunk/net/xfrm/xfrm_policy.c b/trunk/net/xfrm/xfrm_policy.c
index 8b3ef404c794..6459588befc3 100644
--- a/trunk/net/xfrm/xfrm_policy.c
+++ b/trunk/net/xfrm/xfrm_policy.c
@@ -1340,10 +1340,13 @@ static inline struct xfrm_dst *xfrm_alloc_dst(struct net *net, int family)
 	default:
 		BUG();
 	}
-	xdst = dst_alloc(dst_ops) ?: ERR_PTR(-ENOBUFS);
+	xdst = dst_alloc(dst_ops);
 	xfrm_policy_put_afinfo(afinfo);
 
-	xdst->flo.ops = &xfrm_bundle_fc_ops;
+	if (likely(xdst))
+		xdst->flo.ops = &xfrm_bundle_fc_ops;
+	else
+		xdst = ERR_PTR(-ENOBUFS);
 
 	return xdst;
 }