* [PATCH net] sctp: reinit stream if stream outcnt has been change by sinit in sendmsg
@ 2018-01-15 9:01 ` Xin Long
0 siblings, 0 replies; 8+ messages in thread
From: Xin Long @ 2018-01-15 9:01 UTC (permalink / raw)
To: network dev, linux-sctp; +Cc: davem, Marcelo Ricardo Leitner, Neil Horman
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@gmail.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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH net] sctp: reinit stream if stream outcnt has been change by sinit in sendmsg
@ 2018-01-15 9:01 ` Xin Long
0 siblings, 0 replies; 8+ messages in thread
From: Xin Long @ 2018-01-15 9:01 UTC (permalink / raw)
To: network dev, linux-sctp; +Cc: davem, Marcelo Ricardo Leitner, Neil Horman
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@gmail.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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH net] sctp: reinit stream if stream outcnt has been change by sinit in sendmsg
2018-01-15 9:01 ` Xin Long
@ 2018-01-15 12:40 ` Neil Horman
-1 siblings, 0 replies; 8+ messages in thread
From: Neil Horman @ 2018-01-15 12:40 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, davem, Marcelo Ricardo Leitner
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@gmail.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@tuxdriver.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net] sctp: reinit stream if stream outcnt has been change by sinit in sendmsg
@ 2018-01-15 12:40 ` Neil Horman
0 siblings, 0 replies; 8+ messages in thread
From: Neil Horman @ 2018-01-15 12:40 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, davem, Marcelo Ricardo Leitner
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@gmail.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@tuxdriver.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net] sctp: reinit stream if stream outcnt has been change by sinit in sendmsg
2018-01-15 9:01 ` Xin Long
@ 2018-01-15 19:44 ` Marcelo Ricardo Leitner
-1 siblings, 0 replies; 8+ messages in thread
From: Marcelo Ricardo Leitner @ 2018-01-15 19:44 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, davem, Neil Horman
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@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.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
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net] sctp: reinit stream if stream outcnt has been change by sinit in sendmsg
@ 2018-01-15 19:44 ` Marcelo Ricardo Leitner
0 siblings, 0 replies; 8+ messages in thread
From: Marcelo Ricardo Leitner @ 2018-01-15 19:44 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, davem, Neil Horman
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@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.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
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net] sctp: reinit stream if stream outcnt has been change by sinit in sendmsg
2018-01-15 9:01 ` Xin Long
@ 2018-01-16 19:20 ` David Miller
-1 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2018-01-16 19:20 UTC (permalink / raw)
To: lucien.xin; +Cc: netdev, linux-sctp, marcelo.leitner, nhorman
From: Xin Long <lucien.xin@gmail.com>
Date: Mon, 15 Jan 2018 17:01:19 +0800
> 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@gmail.com>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net] sctp: reinit stream if stream outcnt has been change by sinit in sendmsg
@ 2018-01-16 19:20 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2018-01-16 19:20 UTC (permalink / raw)
To: lucien.xin; +Cc: netdev, linux-sctp, marcelo.leitner, nhorman
From: Xin Long <lucien.xin@gmail.com>
Date: Mon, 15 Jan 2018 17:01:19 +0800
> 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@gmail.com>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-01-16 19:21 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-15 9:01 [PATCH net] sctp: reinit stream if stream outcnt has been change by sinit in sendmsg Xin Long
2018-01-15 9:01 ` Xin Long
2018-01-15 12:40 ` Neil Horman
2018-01-15 12:40 ` Neil Horman
2018-01-15 19:44 ` Marcelo Ricardo Leitner
2018-01-15 19:44 ` Marcelo Ricardo Leitner
2018-01-16 19:20 ` David Miller
2018-01-16 19:20 ` David Miller
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.