net: sctp: Fix negotiation of the number of data streams.
[ Upstream commitab921f3cdb
] The number of output and input streams was never being reduced, eg when processing received INIT or INIT_ACK chunks. The effect is that DATA chunks can be sent with invalid stream ids and then discarded by the remote system. Fixes:2075e50caf
("sctp: convert to genradix") Signed-off-by: David Laight <david.laight@aculab.com> Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
4ef63e3654
commit
4d2fe0addc
|
@ -88,12 +88,13 @@ static int sctp_stream_alloc_out(struct sctp_stream *stream, __u16 outcnt,
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (outcnt <= stream->outcnt)
|
if (outcnt <= stream->outcnt)
|
||||||
return 0;
|
goto out;
|
||||||
|
|
||||||
ret = genradix_prealloc(&stream->out, outcnt, gfp);
|
ret = genradix_prealloc(&stream->out, outcnt, gfp);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
out:
|
||||||
stream->outcnt = outcnt;
|
stream->outcnt = outcnt;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -104,12 +105,13 @@ static int sctp_stream_alloc_in(struct sctp_stream *stream, __u16 incnt,
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (incnt <= stream->incnt)
|
if (incnt <= stream->incnt)
|
||||||
return 0;
|
goto out;
|
||||||
|
|
||||||
ret = genradix_prealloc(&stream->in, incnt, gfp);
|
ret = genradix_prealloc(&stream->in, incnt, gfp);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
out:
|
||||||
stream->incnt = incnt;
|
stream->incnt = incnt;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue