netdev - Re: [PATCH net] sctp: reinit stream if stream outcnt has been change by sinit in sendmsg

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: <20180115124017.GA24317@hmswarspite.think-freely.org>
Date:   Mon, 15 Jan 2018 07:40:17 -0500
From:   Neil Horman <nhorman@...driver.com>
To:     Xin Long <lucien.xin@...il.com>
Cc:     network dev <netdev@...r.kernel.org>, linux-sctp@...r.kernel.org,
        davem@...emloft.net,
        Marcelo Ricardo Leitner <marcelo.leitner@...il.com>
Subject: Re: [PATCH net] sctp: reinit stream if stream outcnt has been change
 by sinit in sendmsg

On Mon, Jan 15, 2018 at 05:01:19PM +0800, Xin Long wrote:
> After introducing sctp_stream structure, sctp uses stream->outcnt as the
> out stream nums instead of c.sinit_num_ostreams.
> 
> However when users use sinit in cmsg, it only updates c.sinit_num_ostreams
> in sctp_sendmsg. At that moment, stream->outcnt is still using previous
> value. If it's value is not updated, the sinit_num_ostreams of sinit could
> not really work.
> 
> This patch is to fix it by updating stream->outcnt and reiniting stream
> if stream outcnt has been change by sinit in sendmsg.
> 
> Fixes: a83863174a61 ("sctp: prepare asoc stream for stream reconf")
> Signed-off-by: Xin Long <lucien.xin@...il.com>
> ---
>  net/sctp/socket.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index 9b01e99..15ae018 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -1883,8 +1883,14 @@ static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len)
>  		 */
>  		if (sinit) {
>  			if (sinit->sinit_num_ostreams) {
> -				asoc->c.sinit_num_ostreams =
> -					sinit->sinit_num_ostreams;
> +				__u16 outcnt = sinit->sinit_num_ostreams;
> +
> +				asoc->c.sinit_num_ostreams = outcnt;
> +				/* outcnt has been changed, so re-init stream */
> +				err = sctp_stream_init(&asoc->stream, outcnt, 0,
> +						       GFP_KERNEL);
> +				if (err)
> +					goto out_free;
>  			}
>  			if (sinit->sinit_max_instreams) {
>  				asoc->c.sinit_max_instreams =
> -- 
> 2.1.0
> 
> 
Acked-by: Neil Horman <nhorman@...driver.com>