From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
To: Neil Horman <nhorman@tuxdriver.com>
Cc: Xin Long <lucien.xin@gmail.com>,
network dev <netdev@vger.kernel.org>,
linux-sctp@vger.kernel.org, davem@davemloft.net
Subject: Re: [PATCH net] sctp: hold transport before accessing its asoc in sctp_hash_transport
Date: Wed, 21 Nov 2018 00:46:26 +0000 [thread overview]
Message-ID: <20181121004625.GC3601@localhost.localdomain> (raw)
In-Reply-To: <20181120125248.GA20562@hmswarspite.think-freely.org>
On Tue, Nov 20, 2018 at 07:52:48AM -0500, Neil Horman wrote:
> On Tue, Nov 20, 2018 at 07:09:16PM +0800, Xin Long wrote:
> > In sctp_hash_transport, it dereferences a transport's asoc only under
> > rcu_read_lock. Without holding the transport, its asoc could be freed
> > already, which leads to a use-after-free panic.
> >
> > A similar fix as Commit bab1be79a516 ("sctp: hold transport before
> > accessing its asoc in sctp_transport_get_next") is needed to hold
> > the transport before accessing its asoc in sctp_hash_transport.
> >
> > Fixes: cd2b70875058 ("sctp: check duplicate node before inserting a new transport")
> > Reported-by: syzbot+0b05d8aa7cb185107483@syzkaller.appspotmail.com
> > Signed-off-by: Xin Long <lucien.xin@gmail.com>
> > ---
> > net/sctp/input.c | 7 ++++++-
> > 1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/net/sctp/input.c b/net/sctp/input.c
> > index 5c36a99..69584e9 100644
> > --- a/net/sctp/input.c
> > +++ b/net/sctp/input.c
> > @@ -896,11 +896,16 @@ int sctp_hash_transport(struct sctp_transport *t)
> > list = rhltable_lookup(&sctp_transport_hashtable, &arg,
> > sctp_hash_params);
> >
> > - rhl_for_each_entry_rcu(transport, tmp, list, node)
> > + rhl_for_each_entry_rcu(transport, tmp, list, node) {
> > + if (!sctp_transport_hold(transport))
> > + continue;
> > if (transport->asoc->ep = t->asoc->ep) {
> > + sctp_transport_put(transport);
> > rcu_read_unlock();
> > return -EEXIST;
> > }
> > + sctp_transport_put(transport);
> > + }
> > rcu_read_unlock();
> >
> > err = rhltable_insert_key(&sctp_transport_hashtable, &arg,
> > --
> > 2.1.0
> >
> >
>
> something doesn't feel at all right about this. If we are inserting a transport
> to an association, it would seem to me that we should have at least one user of
> the association (i.e. non-zero refcount). As such it seems something is wrong
> with the association refcount here. At the very least, if there is a case where
> an association is being removed while a transport is being added, the better
> solution would be to ensure that sctp_association_destroy goes through a
> quiescent point prior to unhashing transports from the list, to ensure that
> there is no conflict with the add operation above.
Consider that the rhl_for_each_entry_rcu() is traversing the global
rhashtable, and that it may operate on unrelated transports/asocs.
E.g., transport->asoc in the for() is potentially different from the
asoc under socket lock.
The core of the fix is at:
+ if (!sctp_transport_hold(transport))
+ continue;
If we can get a hold, the asoc will be available for dereferencing in
subsequent lines. Otherwise, move on.
With that, the patch makes sense to me.
Although I would prefer if we come up with a better way to do this
jump, or even avoid the jump. We are only comparing pointers here and
if we had asoc->ep cached on sctp_transport itself, we could avoid the
atomics here.
This change, in the next patch on sctp_epaddr_lookup_transport, will
hurt performance as that is called in datapath. Rhashtable will help
on keeping entry lists to a size, but still.
Marcelo
WARNING: multiple messages have this Message-ID (diff)
From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
To: Neil Horman <nhorman@tuxdriver.com>
Cc: Xin Long <lucien.xin@gmail.com>,
network dev <netdev@vger.kernel.org>,
linux-sctp@vger.kernel.org, davem@davemloft.net
Subject: Re: [PATCH net] sctp: hold transport before accessing its asoc in sctp_hash_transport
Date: Tue, 20 Nov 2018 22:46:26 -0200 [thread overview]
Message-ID: <20181121004625.GC3601@localhost.localdomain> (raw)
In-Reply-To: <20181120125248.GA20562@hmswarspite.think-freely.org>
On Tue, Nov 20, 2018 at 07:52:48AM -0500, Neil Horman wrote:
> On Tue, Nov 20, 2018 at 07:09:16PM +0800, Xin Long wrote:
> > In sctp_hash_transport, it dereferences a transport's asoc only under
> > rcu_read_lock. Without holding the transport, its asoc could be freed
> > already, which leads to a use-after-free panic.
> >
> > A similar fix as Commit bab1be79a516 ("sctp: hold transport before
> > accessing its asoc in sctp_transport_get_next") is needed to hold
> > the transport before accessing its asoc in sctp_hash_transport.
> >
> > Fixes: cd2b70875058 ("sctp: check duplicate node before inserting a new transport")
> > Reported-by: syzbot+0b05d8aa7cb185107483@syzkaller.appspotmail.com
> > Signed-off-by: Xin Long <lucien.xin@gmail.com>
> > ---
> > net/sctp/input.c | 7 ++++++-
> > 1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/net/sctp/input.c b/net/sctp/input.c
> > index 5c36a99..69584e9 100644
> > --- a/net/sctp/input.c
> > +++ b/net/sctp/input.c
> > @@ -896,11 +896,16 @@ int sctp_hash_transport(struct sctp_transport *t)
> > list = rhltable_lookup(&sctp_transport_hashtable, &arg,
> > sctp_hash_params);
> >
> > - rhl_for_each_entry_rcu(transport, tmp, list, node)
> > + rhl_for_each_entry_rcu(transport, tmp, list, node) {
> > + if (!sctp_transport_hold(transport))
> > + continue;
> > if (transport->asoc->ep == t->asoc->ep) {
> > + sctp_transport_put(transport);
> > rcu_read_unlock();
> > return -EEXIST;
> > }
> > + sctp_transport_put(transport);
> > + }
> > rcu_read_unlock();
> >
> > err = rhltable_insert_key(&sctp_transport_hashtable, &arg,
> > --
> > 2.1.0
> >
> >
>
> something doesn't feel at all right about this. If we are inserting a transport
> to an association, it would seem to me that we should have at least one user of
> the association (i.e. non-zero refcount). As such it seems something is wrong
> with the association refcount here. At the very least, if there is a case where
> an association is being removed while a transport is being added, the better
> solution would be to ensure that sctp_association_destroy goes through a
> quiescent point prior to unhashing transports from the list, to ensure that
> there is no conflict with the add operation above.
Consider that the rhl_for_each_entry_rcu() is traversing the global
rhashtable, and that it may operate on unrelated transports/asocs.
E.g., transport->asoc in the for() is potentially different from the
asoc under socket lock.
The core of the fix is at:
+ if (!sctp_transport_hold(transport))
+ continue;
If we can get a hold, the asoc will be available for dereferencing in
subsequent lines. Otherwise, move on.
With that, the patch makes sense to me.
Although I would prefer if we come up with a better way to do this
jump, or even avoid the jump. We are only comparing pointers here and
if we had asoc->ep cached on sctp_transport itself, we could avoid the
atomics here.
This change, in the next patch on sctp_epaddr_lookup_transport, will
hurt performance as that is called in datapath. Rhashtable will help
on keeping entry lists to a size, but still.
Marcelo
next prev parent reply other threads:[~2018-11-21 0:46 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-27 10:38 [PATCH net] sctp: hold transport before accessing its asoc in sctp_transport_get_next Xin Long
2018-08-27 10:38 ` Xin Long
2018-08-27 13:08 ` Neil Horman
2018-08-27 13:08 ` Neil Horman
2018-08-28 16:08 ` Xin Long
2018-08-28 16:08 ` Xin Long
2018-08-29 11:35 ` Neil Horman
2018-08-29 11:35 ` Neil Horman
2018-08-31 7:09 ` Xin Long
2018-08-31 7:09 ` Xin Long
2018-08-31 12:03 ` Neil Horman
2018-08-31 12:03 ` Neil Horman
2018-09-03 13:03 ` Neil Horman
2018-09-03 13:03 ` Neil Horman
2018-08-27 13:28 ` Marcelo Ricardo Leitner
2018-08-27 13:28 ` Marcelo Ricardo Leitner
2018-08-27 22:13 ` David Miller
2018-08-27 22:13 ` David Miller
2018-11-20 11:09 ` [PATCH net] sctp: hold transport before accessing its asoc in sctp_hash_transport Xin Long
2018-11-20 11:09 ` Xin Long
2018-11-20 12:52 ` Neil Horman
2018-11-20 12:52 ` Neil Horman
2018-11-21 0:46 ` Marcelo Ricardo Leitner [this message]
2018-11-21 0:46 ` Marcelo Ricardo Leitner
2018-11-21 6:47 ` Xin Long
2018-11-21 6:47 ` Xin Long
2018-11-21 17:53 ` Marcelo Ricardo Leitner
2018-11-21 17:53 ` Marcelo Ricardo Leitner
2018-11-28 9:36 ` Xin Long
2018-11-28 9:36 ` Xin Long
2018-11-28 13:38 ` Marcelo Ricardo Leitner
2018-11-28 13:38 ` Marcelo Ricardo Leitner
2018-11-21 13:27 ` Neil Horman
2018-11-21 13:27 ` Neil Horman
2018-11-21 18:52 ` Marcelo Ricardo Leitner
2018-11-21 18:52 ` Marcelo Ricardo Leitner
2018-11-20 11:12 ` [PATCH net] sctp: hold transport before accessing its asoc in sctp_epaddr_lookup_transport Xin Long
2018-11-20 11:12 ` Xin Long
2018-11-20 14:00 ` Neil Horman
2018-11-20 14:00 ` Neil Horman
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=20181121004625.GC3601@localhost.localdomain \
--to=marcelo.leitner@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-sctp@vger.kernel.org \
--cc=lucien.xin@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.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.