sctp: fix error return code in sctp_send_add_streams() (dc82673f) · Commits · 戴 / test

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: ("sctp: factor out stream->out allocation") Signed-off-by:

Wei Yongjun <weiyongjun1@huawei.com> Acked-by:

Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Acked-by:

Neil Horman <nhorman@tuxdriver.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/sctp/stream.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -393,7 +393,7 @@ int sctp_send_add_streams(struct sctp_association *asoc,
	{		{
	struct sctp_stream *stream = &asoc->stream;		struct sctp_stream *stream = &asoc->stream;
	struct sctp_chunk *chunk = NULL;		struct sctp_chunk *chunk = NULL;
	int retval = -ENOMEM;		int retval;
	__u32 outcnt, incnt;		__u32 outcnt, incnt;
	__u16 out, in;		__u16 out, in;

	@@ -425,8 +425,10 @@ int sctp_send_add_streams(struct sctp_association *asoc,
	}		}

	chunk = sctp_make_strreset_addstrm(asoc, out, in);		chunk = sctp_make_strreset_addstrm(asoc, out, in);
	if (!chunk)		if (!chunk) {
			retval = -ENOMEM;
	goto out;		goto out;
			}

	asoc->strreset_chunk = chunk;		asoc->strreset_chunk = chunk;
	sctp_chunk_hold(asoc->strreset_chunk);		sctp_chunk_hold(asoc->strreset_chunk);

Admin message