Commit 1ae2eaaa authored by Marcelo Ricardo Leitner's avatar Marcelo Ricardo Leitner Committed by David S. Miller

sctp: silence warns on sctp_stream_init allocations

As SCTP supports up to 65535 streams, that can lead to very large
allocations in sctp_stream_init(). As Xin Long noticed, systems with
small amounts of memory are more prone to not have enough memory and
dump warnings on dmesg initiated by user actions. Thus, silence them.

Also, if the reallocation of stream->out is not necessary, skip it and
keep the memory we already have.
Reported-by: default avatarXin Long <lucien.xin@gmail.com>
Tested-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent af14827f
...@@ -40,9 +40,14 @@ int sctp_stream_init(struct sctp_stream *stream, __u16 outcnt, __u16 incnt, ...@@ -40,9 +40,14 @@ int sctp_stream_init(struct sctp_stream *stream, __u16 outcnt, __u16 incnt,
{ {
int i; int i;
gfp |= __GFP_NOWARN;
/* Initial stream->out size may be very big, so free it and alloc /* Initial stream->out size may be very big, so free it and alloc
* a new one with new outcnt to save memory. * a new one with new outcnt to save memory if needed.
*/ */
if (outcnt == stream->outcnt)
goto in;
kfree(stream->out); kfree(stream->out);
stream->out = kcalloc(outcnt, sizeof(*stream->out), gfp); stream->out = kcalloc(outcnt, sizeof(*stream->out), gfp);
...@@ -53,6 +58,7 @@ int sctp_stream_init(struct sctp_stream *stream, __u16 outcnt, __u16 incnt, ...@@ -53,6 +58,7 @@ int sctp_stream_init(struct sctp_stream *stream, __u16 outcnt, __u16 incnt,
for (i = 0; i < stream->outcnt; i++) for (i = 0; i < stream->outcnt; i++)
stream->out[i].state = SCTP_STREAM_OPEN; stream->out[i].state = SCTP_STREAM_OPEN;
in:
if (!incnt) if (!incnt)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment