Commit b61c654f authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: free msg->chunks when sctp_primitive_SEND return err 



Last patch "sctp: do not return the transmit err back to sctp_sendmsg"
made sctp_primitive_SEND return err only when asoc state is unavailable.
In this case, chunks are not enqueued, they have no chance to be freed if
we don't take care of them later.

This Patch is actually to revert commit 1cd4d5c4 ("sctp: remove the
unused sctp_datamsg_free()"), commit 69b5777f ("sctp: hold the chunks
only after the chunk is enqueued in outq") and commit 8b570dc9 ("sctp:
only drop the reference on the datamsg after sending a msg"), to use
sctp_datamsg_free to free the chunks of current msg.

Fixes: 8b570dc9 ("sctp: only drop the reference on the datamsg after sending a msg")
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 66388f2c

include/net/sctp/structs.h

+1 −0
Original line number Diff line number Diff line
@@ -537,6 +537,7 @@ struct sctp_datamsg { 
struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *,

					    struct sctp_sndrcvinfo *,

					    struct iov_iter *);

void sctp_datamsg_free(struct sctp_datamsg *);

void sctp_datamsg_put(struct sctp_datamsg *);

void sctp_chunk_fail(struct sctp_chunk *, int error);

int sctp_chunk_abandoned(struct sctp_chunk *);

net/sctp/chunk.c

+13 −0
Original line number Diff line number Diff line
@@ -70,6 +70,19 @@ static struct sctp_datamsg *sctp_datamsg_new(gfp_t gfp) 
	return msg;

}



void sctp_datamsg_free(struct sctp_datamsg *msg)

{

	struct sctp_chunk *chunk;



	/* This doesn't have to be a _safe vairant because

	 * sctp_chunk_free() only drops the refs.

	 */

	list_for_each_entry(chunk, &msg->chunks, frag_list)

		sctp_chunk_free(chunk);



	sctp_datamsg_put(msg);

}



/* Final destructruction of datamsg memory. */

static void sctp_datamsg_destroy(struct sctp_datamsg *msg)

{

net/sctp/outqueue.c

+0 −1
Original line number Diff line number Diff line
@@ -304,7 +304,6 @@ int sctp_outq_tail(struct sctp_outq *q, struct sctp_chunk *chunk, gfp_t gfp) 
			 sctp_cname(SCTP_ST_CHUNK(chunk->chunk_hdr->type)) :

			 "illegal chunk");



		sctp_chunk_hold(chunk);

		sctp_outq_tail_data(q, chunk);

		if (chunk->asoc->prsctp_enable &&

		    SCTP_PR_PRIO_ENABLED(chunk->sinfo.sinfo_flags))

net/sctp/socket.c

+6 −2
Original line number Diff line number Diff line
@@ -1958,6 +1958,8 @@ static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len) 


	/* Now send the (possibly) fragmented message. */

	list_for_each_entry(chunk, &datamsg->chunks, frag_list) {

		sctp_chunk_hold(chunk);



		/* Do accounting for the write space.  */

		sctp_set_owner_w(chunk);
@@ -1970,13 +1972,15 @@ static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len) 
	 * breaks.

	 */

	err = sctp_primitive_SEND(net, asoc, datamsg);

	sctp_datamsg_put(datamsg);

	/* Did the lower layer accept the chunk? */

	if (err)

	if (err) {

		sctp_datamsg_free(datamsg);

		goto out_free;

	}



	pr_debug("%s: we sent primitively\n", __func__);



	sctp_datamsg_put(datamsg);

	err = msg_len;



	if (unlikely(wait_connect)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE