Thread (5 messages) 5 messages, 4 authors, 2019-12-18

Re: [PATCH net] sctp: fix memleak on err handling of stream initialization

From: Xin Long <lucien.xin@gmail.com>
Date: 2019-12-17 08:30:08
Also in: linux-sctp

On Tue, Dec 17, 2019 at 9:01 AM Marcelo Ricardo Leitner
[off-list ref] wrote:
quoted hunk ↗ jump to hunk
syzbot reported a memory leak when an allocation fails within
genradix_prealloc() for output streams. That's because
genradix_prealloc() leaves initialized members initialized when the
issue happens and SCTP stack will abort the current initialization but
without cleaning up such members.

The fix here is to always call genradix_free() when genradix_prealloc()
fails, for output and also input streams, as it suffers from the same
issue.

Reported-by: syzbot+772d9e36c490b18d51d1@syzkaller.appspotmail.com
Fixes: 2075e50caf5e ("sctp: convert to genradix")
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
---
 net/sctp/stream.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/sctp/stream.c b/net/sctp/stream.c
index df60b5ef24cbf5c6f628ab8ed88a6faaaa422b6d..e0b01bf912b3f3cdbc3f713bcfa50868e4802929 100644
--- a/net/sctp/stream.c
+++ b/net/sctp/stream.c
@@ -84,8 +84,10 @@ static int sctp_stream_alloc_out(struct sctp_stream *stream, __u16 outcnt,
                return 0;

        ret = genradix_prealloc(&stream->out, outcnt, gfp);
-       if (ret)
+       if (ret) {
+               genradix_free(&stream->out);
                return ret;
+       }

        stream->outcnt = outcnt;
        return 0;
@@ -100,8 +102,10 @@ static int sctp_stream_alloc_in(struct sctp_stream *stream, __u16 incnt,
                return 0;

        ret = genradix_prealloc(&stream->in, incnt, gfp);
-       if (ret)
+       if (ret) {
+               genradix_free(&stream->in);
                return ret;
+       }

        stream->incnt = incnt;
        return 0;
--
2.23.0
Tested-by: Xin Long <lucien.xin@gmail.com>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help