From: Divya Indi <divya.indi@oracle.com>
To: Mark Bloch <markb@mellanox.com>,
"Wan, Kaike" <kaike.wan@intel.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-rdma@vger.kernel.org" <linux-rdma@vger.kernel.org>,
Jason Gunthorpe <jgg@ziepe.ca>
Cc: "Gerd Rausch" <gerd.rausch@oracle.com>,
"Håkon Bugge" <haakon.bugge@oracle.com>,
"Srinivas Eeda" <srinivas.eeda@oracle.com>,
"Rama Nichanamatlu" <rama.nichanamatlu@oracle.com>,
"Doug Ledford" <dledford@redhat.com>
Subject: Re: [PATCH 1/2] IB/sa: Resolving use-after-free in ib_nl_send_msg.
Date: Mon, 11 May 2020 14:10:59 -0700 [thread overview]
Message-ID: <9cdcdf41-5ae9-dcac-d72a-77482ea6a59e@oracle.com> (raw)
In-Reply-To: <b387f32b-c990-614b-c631-b38ddf821757@mellanox.com>
Hi Mark,
Please find my comments inline -
On 5/7/20 2:40 PM, Mark Bloch wrote:
>
> On 5/7/2020 13:16, Wan, Kaike wrote:
>>
>>> -----Original Message-----
>>> From: Mark Bloch <markb@mellanox.com>
>>> Sent: Thursday, May 07, 2020 3:36 PM
>>> To: Divya Indi <divya.indi@oracle.com>; linux-kernel@vger.kernel.org; linux-
>>> rdma@vger.kernel.org; Jason Gunthorpe <jgg@ziepe.ca>; Wan, Kaike
>>> <kaike.wan@intel.com>
>>> Cc: Gerd Rausch <gerd.rausch@oracle.com>; Håkon Bugge
>>> <haakon.bugge@oracle.com>; Srinivas Eeda <srinivas.eeda@oracle.com>;
>>> Rama Nichanamatlu <rama.nichanamatlu@oracle.com>; Doug Ledford
>>> <dledford@redhat.com>
>>> Subject: Re: [PATCH 1/2] IB/sa: Resolving use-after-free in ib_nl_send_msg.
>>>
>>>
>>>> @@ -1123,6 +1156,18 @@ int ib_nl_handle_resolve_resp(struct sk_buff
>>>> *skb,
>>>>
>>>> send_buf = query->mad_buf;
>>>>
>>>> + /*
>>>> + * Make sure the IB_SA_NL_QUERY_SENT flag is set before
>>>> + * processing this query. If flag is not set, query can be accessed in
>>>> + * another context while setting the flag and processing the query
>>> will
>>>> + * eventually release it causing a possible use-after-free.
>>>> + */
>>>> + if (unlikely(!ib_sa_nl_query_sent(query))) {
>>> Can't there be a race here where you check the flag (it isn't set) and before
>>> you call wait_event() the flag is set and wake_up() is called which means you
>>> will wait here forever?
>> Should wait_event() catch that? That is, if the flag is not set, wait_event() will sleep until the flag is set.
>>
>> or worse, a timeout will happen the query will be
>>> freed and them some other query will call wake_up() and we have again a
>>> use-after-free.
>> The request has been deleted from the request list by this time and therefore the timeout should have no impact here.
>>
>>
>>>> + spin_unlock_irqrestore(&ib_nl_request_lock, flags);
>>>> + wait_event(wait_queue, ib_sa_nl_query_sent(query));
>>> What if there are two queries sent to userspace, shouldn't you check and
>>> make sure you got woken up by the right one setting the flag?
>> The wait_event() is conditioned on the specific query (ib_sa_nl_query_sent(query)), not on the wait_queue itself.
> Right, missed that this macro is expends into some inline code.
>
> Looking at the code a little more, I think this also fixes another issue.
> Lets say ib_nl_send_msg() returns an error but before we do the list_del() in
> ib_nl_make_request() there is also a timeout, so in ib_nl_request_timeout()
> we will do list_del() and then another one list_del() will be done in ib_nl_make_request().
>
>>> Other than that, the entire solution makes it very complicated to reason with
>>> (flags set/checked without locking etc) maybe we should just revert and fix it
>>> the other way?
>> The flag could certainly be set under the lock, which may reduce complications.
> Anything that can help here with this.
> For me in ib_nl_make_request() the comment should also explain that not only ib_nl_handle_resolve_resp()
> is waiting for the flag to be set but also ib_nl_request_timeout() and that a timeout can't happen
> before the flag is set.
ib_nl_request_timeout() would re-queue the query to the request list if the flag is not set.
However, makes sense! Noted, il add the comment in ib_nl_make_request to make things more clear.
Thanks,
Divya
> Mark
>
>> Kaike
>> i
next prev parent reply other threads:[~2020-05-11 21:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 18:34 Resolving use-after-free in ib_nl_send_msg Divya Indi
2020-05-07 18:34 ` [PATCH 1/2] IB/sa: " Divya Indi
2020-05-07 19:06 ` Wan, Kaike
2020-05-07 19:36 ` Mark Bloch
2020-05-07 20:16 ` Wan, Kaike
2020-05-07 21:40 ` Mark Bloch
2020-05-11 21:10 ` Divya Indi [this message]
2020-05-11 21:06 ` Divya Indi
2020-05-12 11:15 ` Wan, Kaike
2020-05-08 0:08 ` Jason Gunthorpe
2020-05-11 21:26 ` Divya Indi
2020-05-13 15:00 ` Jason Gunthorpe
2020-05-13 21:02 ` Divya Indi
2020-05-19 23:30 ` Divya Indi
2020-05-20 0:10 ` Jason Gunthorpe
[not found] ` <20200508110302.17872-1-hdanton@sina.com>
2020-05-11 21:30 ` Divya Indi
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=9cdcdf41-5ae9-dcac-d72a-77482ea6a59e@oracle.com \
--to=divya.indi@oracle.com \
--cc=dledford@redhat.com \
--cc=gerd.rausch@oracle.com \
--cc=haakon.bugge@oracle.com \
--cc=jgg@ziepe.ca \
--cc=kaike.wan@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=markb@mellanox.com \
--cc=rama.nichanamatlu@oracle.com \
--cc=srinivas.eeda@oracle.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.