netdev - Re: [PATCH net] sctp: avoid BUG_ON on sctp_wait_for

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CADvbK_c8u=Ot7rmqKQ37ExKD4Gn9acxVNbTJJF=o2EHWWy4QBQ@mail.gmail.com>
Date:   Tue, 7 Feb 2017 21:02:46 +0800
From:   Xin Long <lucien.xin@...il.com>
To:     Marcelo Ricardo Leitner <marcelo.leitner@...il.com>
Cc:     network dev <netdev@...r.kernel.org>, linux-sctp@...r.kernel.org,
        Vlad Yasevich <vyasevich@...il.com>,
        Neil Horman <nhorman@...driver.com>,
        Alexander Popov <alex.popov@...ux.com>
Subject: Re: [PATCH net] sctp: avoid BUG_ON on sctp_wait_for_sndbuf

On Tue, Feb 7, 2017 at 4:10 AM, Marcelo Ricardo Leitner
<marcelo.leitner@...il.com> wrote:
> Alexander Popov reported that an application may trigger a BUG_ON in
> sctp_wait_for_sndbuf if the socket tx buffer is full, a thread is
> waiting on it to queue more data and meanwhile another thread peels off
> the association being used by the first thread.
>
> This patch replaces the BUG_ON call with a proper error handling. It
> will return -EPIPE to the original sendmsg call, similarly to what would
> have been done if the association wasn't found in the first place.
>
> Acked-by: Alexander Popov <alex.popov@...ux.com>
> Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@...il.com>
> ---
> Please consider this to -stable. Thanks
>
Reviewed-by: Xin Long <lucien.xin@...il.com>

>  net/sctp/socket.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index 37eeab7899fc235a56bd2f4ccdb3e6c338a8d48e..e214d2e7e9a30c02847daf354668c42eeaffd0d6 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -7426,7 +7426,8 @@ static int sctp_wait_for_sndbuf(struct sctp_association *asoc, long *timeo_p,
>                  */
>                 release_sock(sk);
>                 current_timeo = schedule_timeout(current_timeo);
> -               BUG_ON(sk != asoc->base.sk);
> +               if (sk != asoc->base.sk)
> +                       goto do_error;
>                 lock_sock(sk);
>
>                 *timeo_p = current_timeo;
> --
> 2.9.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html