---

yaml --- r: 233415 b: refs/heads/master c: 0b15093 h: refs/heads/master i: 233413: eefb598 233411: 4f4cb79 233407: 8d26aa8 v: v3
git-mirror · Feb 11, 2011 · 114c29c · 114c29c
1 parent c29283d
commit 114c29c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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;
 }