malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Elena Reshetova <elena.reshetova@intel.com>
Signed-off-by: Hans Liljestrand <ishkamiel@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David Windsor <dwindsor@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Reshetova, Elena 2017-07-04 15:53:28 +03:00 committed by David S. Miller
parent a4b2b58efd
commit c638457a7c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/sctp/structs.h
View File

@ -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? */

6
net/sctp/associola.c
View File

@ -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);
} }

6
net/sctp/endpointola.c
View File

@ -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);
} }