From: Neil Horman <nhorman@tuxdriver.com>
To: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Cc: syzbot <syzbot+772d9e36c490b18d51d1@syzkaller.appspotmail.com>,
davem@davemloft.net, linux-kernel@vger.kernel.org,
linux-sctp@vger.kernel.org, netdev@vger.kernel.org,
syzkaller-bugs@googlegroups.com, vyasevich@gmail.com
Subject: Re: memory leak in sctp_stream_init
Date: Tue, 17 Dec 2019 06:53:58 -0500 [thread overview]
Message-ID: <20191217115358.GA730@hmswarspite.think-freely.org> (raw)
In-Reply-To: <20191217003716.GC5058@localhost.localdomain>
On Mon, Dec 16, 2019 at 09:37:16PM -0300, Marcelo Ricardo Leitner wrote:
> On Mon, Dec 16, 2019 at 11:56:38AM -0300, Marcelo Ricardo Leitner wrote:
> ...
> > Considering that genradix_prealloc() failure is not fatal, seems the
> > fix here is to just ignore the failure in sctp_stream_alloc_out() and
> > let genradix try again later on.
>
> Better yet, this fixes it here:
>
> ---8<---
>
> diff --git a/net/sctp/stream.c b/net/sctp/stream.c
> index df60b5ef24cb..e0b01bf912b3 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;
>
I get how that fixes this, but that doesn't really seem like the right fix in my
mind. Shouldn't genradix_prealloc internally free any memory its allocated if
it fails part way through its operation?
Neil
prev parent reply other threads:[~2019-12-17 11:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-15 20:35 syzbot
2019-12-16 11:48 ` Neil Horman
2019-12-16 14:56 ` Marcelo Ricardo Leitner
2019-12-17 0:37 ` Marcelo Ricardo Leitner
2019-12-17 11:53 ` Neil Horman [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191217115358.GA730@hmswarspite.think-freely.org \
--to=nhorman@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sctp@vger.kernel.org \
--cc=marcelo.leitner@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=syzbot+772d9e36c490b18d51d1@syzkaller.appspotmail.com \
--cc=syzkaller-bugs@googlegroups.com \
--cc=vyasevich@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®