From: Steffen Klassert <steffen.klassert@secunet.com>
To: Zhuoliang Zhang <zhuoliang.zhang@mediatek.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
"David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>, <wsd_upstream@mediatek.com>
Subject: Re: [PATCH v2] net: xfrm: fix a race condition during allocing spi
Date: Mon, 26 Oct 2020 09:23:38 +0100 [thread overview]
Message-ID: <20201026082338.GS31157@gauss3.secunet.de> (raw)
In-Reply-To: <20201022100126.19565-1-zhuoliang.zhang@mediatek.com>
On Thu, Oct 22, 2020 at 06:01:27PM +0800, Zhuoliang Zhang wrote:
> From: zhuoliang zhang <zhuoliang.zhang@mediatek.com>
>
> we found that the following race condition exists in
> xfrm_alloc_userspi flow:
>
> user thread state_hash_work thread
> ---- ----
> xfrm_alloc_userspi()
> __find_acq_core()
> /*alloc new xfrm_state:x*/
> xfrm_state_alloc()
> /*schedule state_hash_work thread*/
> xfrm_hash_grow_check() xfrm_hash_resize()
> xfrm_alloc_spi /*hold lock*/
> x->id.spi = htonl(spi) spin_lock_bh(&net->xfrm.xfrm_state_lock)
> /*waiting lock release*/ xfrm_hash_transfer()
> spin_lock_bh(&net->xfrm.xfrm_state_lock) /*add x into hlist:net->xfrm.state_byspi*/
> hlist_add_head_rcu(&x->byspi)
> spin_unlock_bh(&net->xfrm.xfrm_state_lock)
>
> /*add x into hlist:net->xfrm.state_byspi 2 times*/
> hlist_add_head_rcu(&x->byspi)
>
> 1. a new state x is alloced in xfrm_state_alloc() and added into the bydst hlist
> in __find_acq_core() on the LHS;
> 2. on the RHS, state_hash_work thread travels the old bydst and tranfers every xfrm_state
> (include x) into the new bydst hlist and new byspi hlist;
> 3. user thread on the LHS gets the lock and adds x into the new byspi hlist again.
>
> So the same xfrm_state (x) is added into the same list_hash
> (net->xfrm.state_byspi) 2 times that makes the list_hash become
> an inifite loop.
>
> To fix the race, x->id.spi = htonl(spi) in the xfrm_alloc_spi() is moved
> to the back of spin_lock_bh, sothat state_hash_work thread no longer add x
> which id.spi is zero into the hash_list.
>
> Fixes: f034b5d4efdf ("[XFRM]: Dynamic xfrm_state hash table sizing.")
> Signed-off-by: zhuoliang zhang <zhuoliang.zhang@mediatek.com>
Applied, thanks a lot!
One remark, please don't use base64 encoding when you send patches.
I had to hand edit your patch to get it applied.
prev parent reply other threads:[~2020-10-26 8:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-22 10:01 [PATCH v2] net: xfrm: fix a race condition during allocing spi Zhuoliang Zhang
2020-10-22 12:29 ` Herbert Xu
2020-10-26 8:23 ` Steffen Klassert [this message]
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=20201026082338.GS31157@gauss3.secunet.de \
--to=steffen.klassert@secunet.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=wsd_upstream@mediatek.com \
--cc=zhuoliang.zhang@mediatek.com \
/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).