From: Elena Reshetova <elena.reshetova@intel.com>
To: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
linux-decnet-user@lists.sourceforge.net, davem@davemloft.net,
jmorris@namei.org, kaber@trash.net, yoshfuji@linux-ipv6.org,
kuznet@ms2.inr.ac.ru, 3chas3@gmail.com, ralf@linux-mips.org,
stephen@networkplumber.org, jchapman@katalix.com,
jhs@mojatatu.com, bridge@lists.linux-foundation.org,
linux-hams@vger.kernel.org, linux-x25@vger.kernel.org,
peterz@infradead.org, keescook@chromium.org,
linux-rdma@vger.kernel.org, linux-sctp@vger.kernel.org,
vyasevich@gmail.com, nhorman@tuxdriver.com,
linux-nfs@vger.kernel.org, zyan@redhat.com, sage@redhat.com,
bfields@fieldses.org, jlayton@poochiereds.net,
steffen.klassert@secunet.com, herbert@gondor.apana.org.au,
santosh.shilimkar@oracle.com, jreuter@yaina.de,
Elena Reshetova <elena.reshetova@intel.com>,
Hans Li
Subject: [PATCH 32/36] net, sctp: convert sctp_transport.refcnt from atomic_t to refcount_t
Date: Tue, 4 Jul 2017 15:53:27 +0300 [thread overview]
Message-ID: <1499172811-16271-33-git-send-email-elena.reshetova@intel.com> (raw)
In-Reply-To: <1499172811-16271-1-git-send-email-elena.reshetova@intel.com>
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>
---
include/net/sctp/structs.h | 2 +-
net/sctp/transport.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 0dfc5c1..6a0d372 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -735,7 +735,7 @@ struct sctp_transport {
struct rhlist_head node;
/* Reference counting. */
- atomic_t refcnt;
+ refcount_t refcnt;
/* RTO-Pending : A flag used to track if one of the DATA
* chunks sent to this address is currently being
* used to compute a RTT. If this flag is 0,
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index 7cdd6bc..80a97c8 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -99,7 +99,7 @@ static struct sctp_transport *sctp_transport_init(struct net *net,
/* Initialize the 64-bit random nonce sent with heartbeat. */
get_random_bytes(&peer->hb_nonce, sizeof(peer->hb_nonce));
- atomic_set(&peer->refcnt, 1);
+ refcount_set(&peer->refcnt, 1);
return peer;
}
@@ -172,7 +172,7 @@ static void sctp_transport_destroy_rcu(struct rcu_head *head)
*/
static void sctp_transport_destroy(struct sctp_transport *transport)
{
- if (unlikely(atomic_read(&transport->refcnt))) {
+ if (unlikely(refcount_read(&transport->refcnt))) {
WARN(1, "Attempt to destroy undead transport %p!\n", transport);
return;
}
@@ -311,7 +311,7 @@ void sctp_transport_route(struct sctp_transport *transport,
/* Hold a reference to a transport. */
int sctp_transport_hold(struct sctp_transport *transport)
{
- return atomic_add_unless(&transport->refcnt, 1, 0);
+ return refcount_inc_not_zero(&transport->refcnt);
}
/* Release a reference to a transport and clean up
@@ -319,7 +319,7 @@ int sctp_transport_hold(struct sctp_transport *transport)
*/
void sctp_transport_put(struct sctp_transport *transport)
{
- if (atomic_dec_and_test(&transport->refcnt))
+ if (refcount_dec_and_test(&transport->refcnt))
sctp_transport_destroy(transport);
}
--
2.7.4
next prev parent reply other threads:[~2017-07-04 12:58 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-04 12:52 [PATCH 00/36] v2 net subsystem misc refcounter conversions Elena Reshetova
2017-07-04 12:52 ` [PATCH 01/36] net, llc: convert llc_sap.refcnt from atomic_t to refcount_t Elena Reshetova
[not found] ` <1499172811-16271-1-git-send-email-elena.reshetova-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-07-04 12:52 ` [PATCH 02/36] net, l2tp: convert l2tp_tunnel.ref_count " Elena Reshetova
2017-07-04 12:53 ` [PATCH 27/36] net, xfrm: convert xfrm_policy.refcnt " Elena Reshetova
2017-07-04 12:52 ` [PATCH 03/36] net, l2tp: convert l2tp_session.ref_count " Elena Reshetova
2017-07-04 12:52 ` [PATCH 04/36] net, vxlan: convert vxlan_sock.refcnt " Elena Reshetova
2017-07-04 12:53 ` [PATCH 05/36] net, decnet: convert dn_fib_info.fib_clntref " Elena Reshetova
2017-07-04 12:53 ` [PATCH 06/36] net, atm: convert atm_dev.refcnt " Elena Reshetova
2017-07-04 12:53 ` [PATCH 07/36] net, atm: convert lec_arp_table.usage " Elena Reshetova
2017-07-04 12:53 ` [PATCH 08/36] net, atm: convert in_cache_entry.use " Elena Reshetova
2017-07-04 12:53 ` [PATCH 09/36] net, atm: convert eg_cache_entry.use " Elena Reshetova
2017-07-04 12:53 ` [PATCH 10/36] net, bridge: convert net_bridge_vlan.refcnt " Elena Reshetova
2017-07-04 12:53 ` [PATCH 11/36] net, calipso: convert calipso_doi.refcount " Elena Reshetova
2017-07-04 12:53 ` [PATCH 12/36] net, sched: convert Qdisc.refcnt " Elena Reshetova
2017-07-04 12:53 ` [PATCH 13/36] net, lapb: convert lapb_cb.refcnt " Elena Reshetova
2017-07-04 12:53 ` [PATCH 14/36] net, ipx: convert ipx_interface.refcnt " Elena Reshetova
2017-07-04 12:53 ` [PATCH 15/36] net, ipx: convert ipx_route.refcnt " Elena Reshetova
2017-07-04 12:53 ` [PATCH 16/36] net, netrom: convert nr_neigh.refcount " Elena Reshetova
2017-07-04 12:53 ` [PATCH 17/36] net, netrom: convert nr_node.refcount " Elena Reshetova
2017-07-04 12:53 ` [PATCH 18/36] net, sunrpc: convert gss_cl_ctx.count " Elena Reshetova
2017-07-04 12:53 ` [PATCH 19/36] net, sunrpc: convert gss_upcall_msg.count " Elena Reshetova
2017-07-04 12:53 ` [PATCH 20/36] net, rds: convert rds_ib_device.refcount " Elena Reshetova
2017-07-04 12:53 ` [PATCH 21/36] net, rds: convert rds_incoming.i_refcount " Elena Reshetova
2017-07-04 12:53 ` [PATCH 22/36] net, rds: convert rds_mr.r_refcount " Elena Reshetova
2017-07-04 12:53 ` [PATCH 23/36] net, rds: convert rds_message.m_refcount " Elena Reshetova
2017-07-04 12:53 ` [PATCH 24/36] net, x25: convert x25_route.refcnt " Elena Reshetova
2017-07-04 12:53 ` [PATCH 25/36] net, x25: convert x25_neigh.refcnt " Elena Reshetova
2017-07-04 12:53 ` [PATCH 26/36] net, xfrm: convert xfrm_state.refcnt " Elena Reshetova
2017-07-04 12:53 ` [PATCH 28/36] net, xfrm: convert sec_path.refcnt " Elena Reshetova
2017-07-04 12:53 ` [PATCH 29/36] net, sctp: convert sctp_auth_bytes.refcnt " Elena Reshetova
2017-07-04 12:53 ` [PATCH 30/36] net, sctp: convert sctp_datamsg.refcnt " Elena Reshetova
2017-07-04 12:53 ` [PATCH 31/36] net, sctp: convert sctp_chunk.refcnt " Elena Reshetova
2017-07-04 12:53 ` Elena Reshetova [this message]
2017-07-04 12:53 ` [PATCH 33/36] net, sctp: convert sctp_ep_common.refcnt " Elena Reshetova
2017-07-04 12:53 ` [PATCH 34/36] net, ax25: convert ax25_uid_assoc.refcount " Elena Reshetova
2017-07-04 12:53 ` [PATCH 35/36] net, ax25: convert ax25_route.refcount " Elena Reshetova
2017-07-04 12:53 ` [PATCH 36/36] net, ax25: convert ax25_cb.refcount " Elena Reshetova
2017-07-04 22:00 ` [PATCH 00/36] v2 net subsystem misc refcounter conversions David Miller
2017-07-05 9:03 ` Reshetova, Elena
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1499172811-16271-33-git-send-email-elena.reshetova@intel.com \
--to=elena.reshetova@intel.com \
--cc=3chas3@gmail.com \
--cc=bfields@fieldses.org \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=jchapman@katalix.com \
--cc=jhs@mojatatu.com \
--cc=jlayton@poochiereds.net \
--cc=jmorris@namei.org \
--cc=jreuter@yaina.de \
--cc=kaber@trash.net \
--cc=keescook@chromium.org \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-decnet-user@lists.sourceforge.net \
--cc=linux-hams@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-sctp@vger.kernel.org \
--cc=linux-x25@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=peterz@infradead.org \
--cc=ralf@linux-mips.org \
--cc=sage@redhat.com \
--cc=santosh.shilimkar@oracle.com \
--cc=steffen.klassert@secunet.com \
--cc=stephen@networkplumber.org \
--cc=vyasevich@gmail.com \
--cc=yoshfuji@linux-ipv6.org \
--cc=zyan@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).