Revert "sctp: leave the err path free in sctp_stream_init to sctp_stream_free"

jira SECO-124

This reverts commit 206a79d2791854e8a3e06c44e89cde26361b1da3.

Incorrect patch for sctp that depends on underlying changes in
sctp_stream_alloc_in(), which are not there in 4.18.x.  Causes
a regression in sctp streams.

Signed-off-by: Greg Rose <[email protected]>

Author: gvrose8192

net/sctp/associola.c

@@ -244,8 +244,9 @@ static struct sctp_association *sctp_association_init(
 	if (!sctp_ulpq_init(&asoc->ulpq, asoc))
 		goto fail_init;
 
-	if (sctp_stream_init(&asoc->stream, asoc->c.sinit_num_ostreams, 0, gfp))
-		goto stream_free;
+	if (sctp_stream_init(&asoc->stream, asoc->c.sinit_num_ostreams,
+			     0, gfp))
+		goto fail_init;
 
 	/* Initialize default path MTU. */
 	asoc->pathmtu = sp->pathmtu;

net/sctp/stream.c

@@ -170,7 +170,7 @@ int sctp_stream_init(struct sctp_stream *stream, __u16 outcnt, __u16 incnt,
 
 	ret = sctp_stream_alloc_out(stream, outcnt, gfp);
 	if (ret)
-		return ret;
+		goto out;
 
 	stream->outcnt = outcnt;
 	for (i = 0; i < stream->outcnt; i++)
@@ -179,9 +179,21 @@ int sctp_stream_init(struct sctp_stream *stream, __u16 outcnt, __u16 incnt,
 in:
 	sctp_stream_interleave_init(stream);
 	if (!incnt)
-		return 0;
+		goto out;
 
-	return sctp_stream_alloc_in(stream, incnt, gfp);
+	ret = sctp_stream_alloc_in(stream, incnt, gfp);
+	if (ret) {
+		sched->free(stream);
+		kfree(stream->out);
+		stream->out = NULL;
+		stream->outcnt = 0;
+		goto out;
+	}
+
+	stream->incnt = incnt;
+
+out:
+	return ret;
 }
 
 int sctp_stream_init_ext(struct sctp_stream *stream, __u16 sid)