netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
	Steffen Klassert <steffen.klassert@secunet.com>,
	<netdev@vger.kernel.org>
Subject: [PATCH 5/5] xfrm: Fix unlink race when policies are deleted.
Date: Thu, 27 Feb 2014 07:16:39 +0100	[thread overview]
Message-ID: <1393481799-20492-6-git-send-email-steffen.klassert@secunet.com> (raw)
In-Reply-To: <1393481799-20492-1-git-send-email-steffen.klassert@secunet.com>

When a policy is unlinked from the lists in thread context,
the xfrm timer can fire before we can mark this policy as dead.
So reinitialize the bydst hlist, then hlist_unhashed() will
notice that this policy is not linked and will avoid a
doulble unlink of that policy.

Reported-by: Xianpeng Zhao <673321875@qq.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
 net/xfrm/xfrm_policy.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 4b98b25..1d5c7bf 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1158,7 +1158,7 @@ static struct xfrm_policy *__xfrm_policy_unlink(struct xfrm_policy *pol,
 	if (hlist_unhashed(&pol->bydst))
 		return NULL;
 
-	hlist_del(&pol->bydst);
+	hlist_del_init(&pol->bydst);
 	hlist_del(&pol->byidx);
 	list_del(&pol->walk.all);
 	net->xfrm.policy_count[dir]--;
-- 
1.7.9.5

  parent reply	other threads:[~2014-02-27  6:16 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-27  6:16 pull request (net): ipsec 2014-02-27 Steffen Klassert
2014-02-27  6:16 ` [PATCH 1/5] ip6_vti: Fix build when NET_IP_TUNNEL is not set Steffen Klassert
2014-02-27  6:16 ` [PATCH 2/5] xfrm: Fix NULL pointer dereference on sub policy usage Steffen Klassert
2014-02-27  6:16 ` [PATCH 3/5] xfrm: Take xfrm_state_lock in xfrm_migrate_state_find Steffen Klassert
2014-02-27  6:16 ` [PATCH 4/5] xfrm: Clone states properly on migration Steffen Klassert
2014-02-27  6:16 ` Steffen Klassert [this message]
2014-02-27  6:27   ` [PATCH 5/5] xfrm: Fix unlink race when policies are deleted Herbert Xu
2014-02-27  6:30     ` Herbert Xu
2014-02-27  6:53       ` Steffen Klassert
2014-02-27  7:01         ` Herbert Xu
2014-02-27 21:20 ` pull request (net): ipsec 2014-02-27 David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1393481799-20492-6-git-send-email-steffen.klassert@secunet.com \
    --to=steffen.klassert@secunet.com \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).