Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1603261

[PATCH 15/23] net, xfrm: convert sec_path.refcnt from atomic_t to refcount_t

Show all headers | View raw

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/xfrm.h    | 6 +++---
 net/xfrm/xfrm_input.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index be30846..35d1cca 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1005,7 +1005,7 @@ struct xfrm_offload {
 };
 
 struct sec_path {
-	atomic_t		refcnt;
+	refcount_t		refcnt;
 	int			len;
 	int			olen;
 
@@ -1026,7 +1026,7 @@ static inline struct sec_path *
 secpath_get(struct sec_path *sp)
 {
 	if (sp)
-		atomic_inc(&sp->refcnt);
+		refcount_inc(&sp->refcnt);
 	return sp;
 }
 
@@ -1035,7 +1035,7 @@ void __secpath_destroy(struct sec_path *sp);
 static inline void
 secpath_put(struct sec_path *sp)
 {
-	if (sp && atomic_dec_and_test(&sp->refcnt))
+	if (sp && refcount_dec_and_test(&sp->refcnt))
 		__secpath_destroy(sp);
 }
 
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index 46bdb4f..203ba90 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -114,7 +114,7 @@ struct sec_path *secpath_dup(struct sec_path *src)
 		for (i = 0; i < sp->len; i++)
 			xfrm_state_hold(sp->xvec[i]);
 	}
-	atomic_set(&sp->refcnt, 1);
+	refcount_set(&sp->refcnt, 1);
 	return sp;
 }
 EXPORT_SYMBOL(secpath_dup);
@@ -124,7 +124,7 @@ int secpath_set(struct sk_buff *skb)
 	struct sec_path *sp;
 
 	/* Allocate new secpath or COW existing one. */
-	if (!skb->sp || atomic_read(&skb->sp->refcnt) != 1) {
+	if (!skb->sp || refcount_read(&skb->sp->refcnt) != 1) {
 		sp = secpath_dup(skb->sp);
 		if (!sp)
 			return -ENOMEM;
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/23] various networking refcount conversions, part 2 Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:20 +0100
  [PATCH 16/23] net, sctp: convert sctp_auth_bytes.refcnt from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:20 +0100
  [PATCH 07/23] net, rds: convert rds_ib_device.refcount from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:20 +0100
  [PATCH 14/23] net, xfrm: convert xfrm_policy.refcnt from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:20 +0100
  [PATCH 02/23] net, sunrpc: convert gss_cl_ctx.count from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:20 +0100
  [PATCH 06/23] net, ceph: convert ceph_pagelist.refcnt from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:20 +0100
    Re: [PATCH 06/23] net, ceph: convert ceph_pagelist.refcnt from  atomic_t to refcount_t Ilya Dryomov <idryomov@gmail.com> - 2017-03-24 15:00 +0100
  [PATCH 08/23] net, rds: convert rds_incoming.i_refcount from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:20 +0100
  [PATCH 05/23] net, ceph: convert ceph_osd.o_ref from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:20 +0100
    Re: [PATCH 05/23] net, ceph: convert ceph_osd.o_ref from atomic_t to refcount_t Ilya Dryomov <idryomov@gmail.com> - 2017-03-24 15:00 +0100
  [PATCH 21/23] net, ax25: convert ax25_uid_assoc.refcount from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:30 +0100
  [PATCH 15/23] net, xfrm: convert sec_path.refcnt from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:30 +0100
  [PATCH 23/23] net, ax25: convert ax25_cb.refcount from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:30 +0100
  [PATCH 10/23] net, rds: convert rds_message.m_refcount from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:30 +0100
  [PATCH 09/23] net, rds: convert rds_mr.r_refcount from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:30 +0100
  [PATCH 12/23] net, x25: convert x25_neigh.refcnt from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:30 +0100
  [PATCH 19/23] net, sctp: convert sctp_transport.refcnt from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:30 +0100
  [PATCH 11/23] net, x25: convert x25_route.refcnt from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:30 +0100
  [PATCH 13/23] net, xfrm: convert xfrm_state.refcnt from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:30 +0100
  [PATCH 18/23] net, sctp: convert sctp_chunk.refcnt from atomic_t to refcount_t Elena Reshetova <elena.reshetova@intel.com> - 2017-03-17 13:30 +0100

csiph-web