From: Jacek Luczak <difrost.kernel@gmail.com>
To: Vladislav Yasevich <vladislav.yasevich@hp.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>,
Wei Yongjun <yjwei@cn.fujitsu.com>,
netdev@vger.kernel.org
Subject: Re: [PATCH] SCTP: fix race between sctp_bind_addr_free() and sctp_bind_addr_conflict()
Date: Wed, 18 May 2011 15:39:14 +0200 [thread overview]
Message-ID: <BANLkTi=7T5-mGCWv_ge=HSGALVp4HpUsiA@mail.gmail.com> (raw)
In-Reply-To: <4DD3CA57.5060709@hp.com>
2011/5/18 Vladislav Yasevich <vladislav.yasevich@hp.com>:
> On 05/18/2011 09:11 AM, Jacek Luczak wrote:
>> 2011/5/18 Eric Dumazet <eric.dumazet@gmail.com>:
>>> Le mercredi 18 mai 2011 à 14:47 +0200, Jacek Luczak a écrit :
>>>
>>>> OK then, at the end what Eric suggested is IMO valid:
>>>>
>>>> diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c
>>>> index faf71d1..0025d90 100644
>>>> --- a/net/sctp/bind_addr.c
>>>> +++ b/net/sctp/bind_addr.c
>>>> @@ -144,10 +144,9 @@ static void sctp_bind_addr_clean(struct sctp_bind_addr *bp)
>>>> struct list_head *pos, *temp;
>>>>
>>>> /* Empty the bind address list. */
>>>> - list_for_each_safe(pos, temp, &bp->address_list) {
>>>> - addr = list_entry(pos, struct sctp_sockaddr_entry, list);
>>>> - list_del(pos);
>>>> - kfree(addr);
>>>> + list_for_each_entry(pos, &bp->address_list, list) {
>>>
>>> a 'safe' version is needed here, since we remove items in iterator.
>>
>> Yep.
>>
>> diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c
>> index faf71d1..6150ac5 100644
>> --- a/net/sctp/bind_addr.c
>> +++ b/net/sctp/bind_addr.c
>> @@ -140,14 +140,12 @@ void sctp_bind_addr_init(struct sctp_bind_addr
>> *bp, __u16 port)
>> /* Dispose of the address list. */
>> static void sctp_bind_addr_clean(struct sctp_bind_addr *bp)
>> {
>> - struct sctp_sockaddr_entry *addr;
>> - struct list_head *pos, *temp;
>> + struct sctp_sockaddr_entry *addr, *temp;
>>
>> /* Empty the bind address list. */
>> - list_for_each_safe(pos, temp, &bp->address_list) {
>> - addr = list_entry(pos, struct sctp_sockaddr_entry, list);
>> - list_del(pos);
>> - kfree(addr);
>> + list_for_each_entry_safe(addr, temp, &bp->address_list, list) {
>> + list_del_rcu(&addr->list);
>> + call_rcu(&addr->rcu, sctp_local_addr_free);
>> SCTP_DBG_OBJCNT_DEC(addr);
>> }
>> }
>>
>> Does it now look good?
>
> Yes. It should the fix the race.
>
Thanks guys then for your guidance. I will repost final patch.
-Jacek
next prev parent reply other threads:[~2011-05-18 13:39 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-18 7:01 [PATCH] SCTP: fix race between sctp_bind_addr_free() and sctp_bind_addr_conflict() Jacek Luczak
2011-05-18 7:48 ` Eric Dumazet
2011-05-18 8:06 ` Jacek Luczak
2011-05-18 8:29 ` Eric Dumazet
2011-05-18 9:02 ` Wei Yongjun
2011-05-18 11:01 ` Jacek Luczak
2011-05-18 11:41 ` Eric Dumazet
2011-05-18 11:58 ` Jacek Luczak
2011-05-18 12:33 ` Vladislav Yasevich
2011-05-18 12:47 ` Jacek Luczak
2011-05-18 12:50 ` Eric Dumazet
2011-05-18 13:11 ` Jacek Luczak
2011-05-18 13:20 ` Eric Dumazet
2011-05-18 13:32 ` Vladislav Yasevich
2011-05-18 13:39 ` Jacek Luczak [this message]
2011-05-18 12:06 ` Jacek Luczak
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='BANLkTi=7T5-mGCWv_ge=HSGALVp4HpUsiA@mail.gmail.com' \
--to=difrost.kernel@gmail.com \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=vladislav.yasevich@hp.com \
--cc=yjwei@cn.fujitsu.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).