From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
To: Wei Yongjun <weiyongjun1@huawei.com>
Cc: Vlad Yasevich <vyasevich@gmail.com>,
Neil Horman <nhorman@tuxdriver.com>,
linux-sctp@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH net-next] sctp: fix error return code in sctp_send_add_streams()
Date: Tue, 31 Oct 2017 11:33:29 -0200 [thread overview]
Message-ID: <20171031133328.GB3675@localhost.localdomain> (raw)
In-Reply-To: <1509456496-93944-1-git-send-email-weiyongjun1@huawei.com>
On Tue, Oct 31, 2017 at 01:28:16PM +0000, Wei Yongjun wrote:
> Fix to returnerror code -ENOMEM from the sctp_make_strreset_addstrm()
> error handling case instead of 0. 'retval' can be overwritten to 0 after
> call sctp_stream_alloc_out().
>
> Fixes: e090abd0d81c ("sctp: factor out stream->out allocation")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
> ---
> net/sctp/stream.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/net/sctp/stream.c b/net/sctp/stream.c
> index 03764fc..b8c8cab 100644
> --- a/net/sctp/stream.c
> +++ b/net/sctp/stream.c
> @@ -393,7 +393,7 @@ int sctp_send_add_streams(struct sctp_association *asoc,
> {
> struct sctp_stream *stream = &asoc->stream;
> struct sctp_chunk *chunk = NULL;
> - int retval = -ENOMEM;
> + int retval;
> __u32 outcnt, incnt;
> __u16 out, in;
>
> @@ -425,8 +425,10 @@ int sctp_send_add_streams(struct sctp_association *asoc,
> }
>
> chunk = sctp_make_strreset_addstrm(asoc, out, in);
> - if (!chunk)
> + if (!chunk) {
> + retval = -ENOMEM;
> goto out;
> + }
>
> asoc->strreset_chunk = chunk;
> sctp_chunk_hold(asoc->strreset_chunk);
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2017-10-31 13:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-31 13:28 [PATCH net-next] sctp: fix error return code in sctp_send_add_streams() Wei Yongjun
2017-10-31 13:33 ` Marcelo Ricardo Leitner [this message]
2017-10-31 17:06 ` Neil Horman
2017-11-01 12:26 ` David Miller
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=20171031133328.GB3675@localhost.localdomain \
--to=marcelo.leitner@gmail.com \
--cc=linux-sctp@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=vyasevich@gmail.com \
--cc=weiyongjun1@huawei.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;
as well as URLs for NNTP newsgroup(s).