patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / net / xfrm / xfrm_policy.c

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 714e6f3..2e60c84 100644 (file)
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -148,6 +148,8 @@ static void xfrm_policy_timer(unsigned long data)
        int warn = 0;
        int dir;
 
+       read_lock(&xp->lock);
+
        if (xp->dead)
                goto out;
 
@@ -197,6 +199,7 @@ static void xfrm_policy_timer(unsigned long data)
                xfrm_pol_hold(xp);
 
 out:
+       read_unlock(&xp->lock);
        xfrm_pol_put(xp);
        return;
 
@@ -1014,6 +1017,8 @@ static int stale_bundle(struct dst_entry *dst)
 
 static void xfrm_dst_destroy(struct dst_entry *dst)
 {
+       if (!dst->xfrm)
+               return;
        xfrm_state_put(dst->xfrm);
        dst->xfrm = NULL;
 }