diff options
| author | Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> | 2017-10-04 01:20:08 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-04 02:27:28 +0300 |
| commit | 1ae2eaaa229bc350b6f38fbf4ab9c873532aecfb (patch) | |
| tree | d98497191233346cbe9aabbd73829c575f3850f9 /net/sctp | |
| parent | af14827fa38cfc592e04287dd83b32059bdca328 (diff) | |
| download | linux-1ae2eaaa229bc350b6f38fbf4ab9c873532aecfb.tar.xz | |
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: Xin Long <lucien.xin@gmail.com>
Tested-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/stream.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/sctp/stream.c b/net/sctp/stream.c index 63ea15503714..1afa95558083 100644 --- a/net/sctp/stream.c +++ b/net/sctp/stream.c @@ -40,9 +40,14 @@ int sctp_stream_init(struct sctp_stream *stream, __u16 outcnt, __u16 incnt, { int i; + gfp |= __GFP_NOWARN; + /* 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); stream->out = kcalloc(outcnt, sizeof(*stream->out), gfp); @@ -53,6 +58,7 @@ int sctp_stream_init(struct sctp_stream *stream, __u16 outcnt, __u16 incnt, for (i = 0; i < stream->outcnt; i++) stream->out[i].state = SCTP_STREAM_OPEN; +in: if (!incnt) return 0; |