Skip to content

Commit

Permalink
sctp: fix memleak on err handling of stream initialization
Browse files Browse the repository at this point in the history
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: 2075e50 ("sctp: convert to genradix")
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Tested-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
marceloleitner authored and davem330 committed Dec 18, 2019
1 parent 040cda8 commit 951c6db
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions net/sctp/stream.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 951c6db

Please sign in to comment.