Commit c638457a authored by Reshetova, Elena's avatar Reshetova, Elena Committed by David S. Miller
Browse files

net, sctp: convert sctp_ep_common.refcnt from atomic_t to refcount_t 



refcount_t type and corresponding API should be
used instead of atomic_t when the variable is used as
a reference counter. This allows to avoid accidental
refcounter overflows that might lead to use-after-free
situations.

Signed-off-by: default avatarElena Reshetova <elena.reshetova@intel.com>
Signed-off-by: default avatarHans Liljestrand <ishkamiel@gmail.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDavid Windsor <dwindsor@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a4b2b58e

include/net/sctp/structs.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1174,7 +1174,7 @@ struct sctp_ep_common { 
	 *   refcnt   - Reference count access to this object.

	 *   refcnt   - Reference count access to this object.

	 *   dead     - Do not attempt to use this object.

	 *   dead     - Do not attempt to use this object.

	 */

	 */

	atomic_t    refcnt;

	refcount_t    refcnt;

	bool	    dead;

	bool	    dead;





	/* What socket does this endpoint belong to?  */

	/* What socket does this endpoint belong to?  */

net/sctp/associola.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a 
	asoc->base.type = SCTP_EP_TYPE_ASSOCIATION;

	asoc->base.type = SCTP_EP_TYPE_ASSOCIATION;





	/* Initialize the object handling fields.  */

	/* Initialize the object handling fields.  */

	atomic_set(&asoc->base.refcnt, 1);

	refcount_set(&asoc->base.refcnt, 1);





	/* Initialize the bind addr area.  */

	/* Initialize the bind addr area.  */

	sctp_bind_addr_init(&asoc->base.bind_addr, ep->base.bind_addr.port);

	sctp_bind_addr_init(&asoc->base.bind_addr, ep->base.bind_addr.port);
@@ -873,7 +873,7 @@ void sctp_assoc_control_transport(struct sctp_association *asoc, 
/* Hold a reference to an association. */

/* Hold a reference to an association. */

void sctp_association_hold(struct sctp_association *asoc)

void sctp_association_hold(struct sctp_association *asoc)

{

{

	atomic_inc(&asoc->base.refcnt);

	refcount_inc(&asoc->base.refcnt);

}

}





/* Release a reference to an association and cleanup

/* Release a reference to an association and cleanup
@@ -881,7 +881,7 @@ void sctp_association_hold(struct sctp_association *asoc) 
 */

 */

void sctp_association_put(struct sctp_association *asoc)

void sctp_association_put(struct sctp_association *asoc)

{

{

	if (atomic_dec_and_test(&asoc->base.refcnt))

	if (refcount_dec_and_test(&asoc->base.refcnt))

		sctp_association_destroy(asoc);

		sctp_association_destroy(asoc);

}

}

net/sctp/endpointola.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -114,7 +114,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, 
	ep->base.type = SCTP_EP_TYPE_SOCKET;

	ep->base.type = SCTP_EP_TYPE_SOCKET;





	/* Initialize the basic object fields. */

	/* Initialize the basic object fields. */

	atomic_set(&ep->base.refcnt, 1);

	refcount_set(&ep->base.refcnt, 1);

	ep->base.dead = false;

	ep->base.dead = false;





	/* Create an input queue.  */

	/* Create an input queue.  */
@@ -285,7 +285,7 @@ static void sctp_endpoint_destroy(struct sctp_endpoint *ep) 
/* Hold a reference to an endpoint. */

/* Hold a reference to an endpoint. */

void sctp_endpoint_hold(struct sctp_endpoint *ep)

void sctp_endpoint_hold(struct sctp_endpoint *ep)

{

{

	atomic_inc(&ep->base.refcnt);

	refcount_inc(&ep->base.refcnt);

}

}





/* Release a reference to an endpoint and clean up if there are

/* Release a reference to an endpoint and clean up if there are
@@ -293,7 +293,7 @@ void sctp_endpoint_hold(struct sctp_endpoint *ep) 
 */

 */

void sctp_endpoint_put(struct sctp_endpoint *ep)

void sctp_endpoint_put(struct sctp_endpoint *ep)

{

{

	if (atomic_dec_and_test(&ep->base.refcnt))

	if (refcount_dec_and_test(&ep->base.refcnt))

		sctp_endpoint_destroy(ep);

		sctp_endpoint_destroy(ep);

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE