Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b4472cc authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller
Browse files

sctp: fix memory leak of the ASCONF queue when free asoc 



If an ASCONF chunk is outstanding, then the following ASCONF
chunk will be queued for later transmission. But when we free
the asoc, we forget to free the ASCONF queue at the same time,
this will cause memory leak.

Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f11970e3

net/sctp/associola.c

+16 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
/* Forward declarations for internal functions. */

static void sctp_assoc_bh_rcv(struct work_struct *work);

static void sctp_assoc_free_asconf_acks(struct sctp_association *asoc);

static void sctp_assoc_free_asconf_queue(struct sctp_association *asoc);



/* Keep track of the new idr low so that we don't re-use association id

 * numbers too fast.  It is protected by they idr spin lock is in the
@@ -446,6 +447,9 @@ void sctp_association_free(struct sctp_association *asoc) 
	/* Free any cached ASCONF_ACK chunk. */

	sctp_assoc_free_asconf_acks(asoc);



	/* Free the ASCONF queue. */

	sctp_assoc_free_asconf_queue(asoc);



	/* Free any cached ASCONF chunk. */

	if (asoc->addip_last_asconf)

		sctp_chunk_free(asoc->addip_last_asconf);
@@ -1578,6 +1582,18 @@ int sctp_assoc_set_id(struct sctp_association *asoc, gfp_t gfp) 
	return error;

}



/* Free the ASCONF queue */

static void sctp_assoc_free_asconf_queue(struct sctp_association *asoc)

{

	struct sctp_chunk *asconf;

	struct sctp_chunk *tmp;



	list_for_each_entry_safe(asconf, tmp, &asoc->addip_chunk_list, list) {

		list_del_init(&asconf->list);

		sctp_chunk_free(asconf);

	}

}



/* Free asconf_ack cache */

static void sctp_assoc_free_asconf_acks(struct sctp_association *asoc)

{