---

yaml --- r: 200548 b: refs/heads/master c: b1312c8 h: refs/heads/master v: v3
git-mirror · Jun 24, 2010 · 66eac08 · 66eac08
1 parent dac226b
commit 66eac08
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38000a94a902e94ca8b5498f7871c6316de8957a
+refs/heads/master: b1312c89f0016f778cac4f1536f1434e132f8713
diff --git a/trunk/net/xfrm/xfrm_policy.c b/trunk/net/xfrm/xfrm_policy.c
@@ -2300,7 +2300,8 @@ int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first,
 			return 0;
 		if (xdst->xfrm_genid != dst->xfrm->genid)
 			return 0;
-		if (xdst->policy_genid != atomic_read(&xdst->pols[0]->genid))
+		if (xdst->num_pols > 0 &&
+		    xdst->policy_genid != atomic_read(&xdst->pols[0]->genid))
 			return 0;
 
 		if (strict && fl &&