From: Vlad Yasevich <vyasevich@gmail.com>
To: Daniel Borkmann <dborkman@redhat.com>, davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-sctp@vger.kernel.org,
Vlad Yasevich <vyasevic@redhat.com>
Subject: Re: [PATCH net v2] net: sctp: test if association is dead in sctp_wake_up_waiters
Date: Wed, 09 Apr 2014 12:55:07 +0000 [thread overview]
Message-ID: <5345432B.40100@gmail.com> (raw)
In-Reply-To: <de3e98e644dde7dcaea9a952de38eb32a2959eeb.1396999714.git.dborkman@redhat.com>
On 04/08/2014 07:32 PM, Daniel Borkmann wrote:
> In function sctp_wake_up_waiters(), we need to involve a test
> if the association is declared dead. If so, we don't have any
> reference to a possible sibling association anymore and need
> to invoke sctp_write_space() instead and normally walk the
> socket's associations and notify them of new wmem space. The
> reason for special casing is that, otherwise, we could run
> into the following issue:
>
> sctp_association_free()
> `-> list_del(&asoc->asocs) <-- poisons list pointer
> asoc->base.dead = true
> sctp_outq_free(&asoc->outqueue)
> `-> __sctp_outq_teardown()
> `-> sctp_chunk_free()
> `-> consume_skb()
> `-> sctp_wfree()
> `-> sctp_wake_up_waiters() <-- dereferences poisoned pointers
> if asoc->ep->sndbuf_policy=0
>
> Therefore, only walk the list in an 'optimized' way if we find
> that the current association is still active. We could also use
> list_del_init() in addition when we call sctp_association_free(),
> but as Vlad suggests, we want to trap such bugs and thus leave
> it poisoned as is. Stress-testing seems fine now.
>
> Fixes: cd253f9f357d ("net: sctp: wake up all assocs if sndbuf policy is per socket")
> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
> Cc: Vlad Yasevich <vyasevic@redhat.com>
Acked-by: Vlad Yasevich <vyasevic@redhat.com>
-vlad
> ---
> v1->v2:
> - leave list_del()
>
> net/sctp/socket.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index 5f83a6a..270d5bd 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -6604,6 +6604,12 @@ static void sctp_wake_up_waiters(struct sock *sk,
> if (asoc->ep->sndbuf_policy)
> return __sctp_write_space(asoc);
>
> + /* If association goes down and is just flushing its
> + * outq, then just normally notify others.
> + */
> + if (asoc->base.dead)
> + return sctp_write_space(sk);
> +
> /* Accounting for the sndbuf space is per socket, so we
> * need to wake up others, try to be fair and in case of
> * other associations, let them have a go first instead
>
WARNING: multiple messages have this Message-ID (diff)
From: Vlad Yasevich <vyasevich@gmail.com>
To: Daniel Borkmann <dborkman@redhat.com>, davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-sctp@vger.kernel.org,
Vlad Yasevich <vyasevic@redhat.com>
Subject: Re: [PATCH net v2] net: sctp: test if association is dead in sctp_wake_up_waiters
Date: Wed, 09 Apr 2014 08:55:07 -0400 [thread overview]
Message-ID: <5345432B.40100@gmail.com> (raw)
In-Reply-To: <de3e98e644dde7dcaea9a952de38eb32a2959eeb.1396999714.git.dborkman@redhat.com>
On 04/08/2014 07:32 PM, Daniel Borkmann wrote:
> In function sctp_wake_up_waiters(), we need to involve a test
> if the association is declared dead. If so, we don't have any
> reference to a possible sibling association anymore and need
> to invoke sctp_write_space() instead and normally walk the
> socket's associations and notify them of new wmem space. The
> reason for special casing is that, otherwise, we could run
> into the following issue:
>
> sctp_association_free()
> `-> list_del(&asoc->asocs) <-- poisons list pointer
> asoc->base.dead = true
> sctp_outq_free(&asoc->outqueue)
> `-> __sctp_outq_teardown()
> `-> sctp_chunk_free()
> `-> consume_skb()
> `-> sctp_wfree()
> `-> sctp_wake_up_waiters() <-- dereferences poisoned pointers
> if asoc->ep->sndbuf_policy=0
>
> Therefore, only walk the list in an 'optimized' way if we find
> that the current association is still active. We could also use
> list_del_init() in addition when we call sctp_association_free(),
> but as Vlad suggests, we want to trap such bugs and thus leave
> it poisoned as is. Stress-testing seems fine now.
>
> Fixes: cd253f9f357d ("net: sctp: wake up all assocs if sndbuf policy is per socket")
> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
> Cc: Vlad Yasevich <vyasevic@redhat.com>
Acked-by: Vlad Yasevich <vyasevic@redhat.com>
-vlad
> ---
> v1->v2:
> - leave list_del()
>
> net/sctp/socket.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index 5f83a6a..270d5bd 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -6604,6 +6604,12 @@ static void sctp_wake_up_waiters(struct sock *sk,
> if (asoc->ep->sndbuf_policy)
> return __sctp_write_space(asoc);
>
> + /* If association goes down and is just flushing its
> + * outq, then just normally notify others.
> + */
> + if (asoc->base.dead)
> + return sctp_write_space(sk);
> +
> /* Accounting for the sndbuf space is per socket, so we
> * need to wake up others, try to be fair and in case of
> * other associations, let them have a go first instead
>
next prev parent reply other threads:[~2014-04-09 12:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-08 23:32 [PATCH net v2] net: sctp: test if association is dead in sctp_wake_up_waiters Daniel Borkmann
2014-04-08 23:32 ` Daniel Borkmann
2014-04-09 8:09 ` Daniel Borkmann
2014-04-09 8:09 ` Daniel Borkmann
2014-04-09 10:32 ` Daniel Borkmann
2014-04-09 10:32 ` Daniel Borkmann
2014-04-09 10:59 ` Neil Horman
2014-04-09 10:59 ` Neil Horman
2014-04-09 13:34 ` Daniel Borkmann
2014-04-09 13:34 ` Daniel Borkmann
2014-04-09 12:56 ` Vlad Yasevich
2014-04-09 12:56 ` Vlad Yasevich
2014-04-09 12:52 ` Vlad Yasevich
2014-04-09 12:52 ` Vlad Yasevich
2014-04-09 12:55 ` Vlad Yasevich [this message]
2014-04-09 12:55 ` Vlad Yasevich
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=5345432B.40100@gmail.com \
--to=vyasevich@gmail.com \
--cc=davem@davemloft.net \
--cc=dborkman@redhat.com \
--cc=linux-sctp@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=vyasevic@redhat.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.