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

Groups > linux.kernel > #1603266

[PATCH 12/23] net, x25: convert x25_neigh.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/x25.h  | 6 +++---
 net/x25/x25_link.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/net/x25.h b/include/net/x25.h
index 83a6d31..265756c 100644
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -142,7 +142,7 @@ struct x25_neigh {
 	unsigned long		t20;
 	struct timer_list	t20timer;
 	unsigned long		global_facil_mask;
-	atomic_t		refcnt;
+	refcount_t		refcnt;
 };
 
 struct x25_sock {
@@ -243,12 +243,12 @@ void x25_link_free(void);
 /* x25_neigh.c */
 static __inline__ void x25_neigh_hold(struct x25_neigh *nb)
 {
-	atomic_inc(&nb->refcnt);
+	refcount_inc(&nb->refcnt);
 }
 
 static __inline__ void x25_neigh_put(struct x25_neigh *nb)
 {
-	if (atomic_dec_and_test(&nb->refcnt))
+	if (refcount_dec_and_test(&nb->refcnt))
 		kfree(nb);
 }
 
diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c
index bcaa180..e0cd04d 100644
--- a/net/x25/x25_link.c
+++ b/net/x25/x25_link.c
@@ -266,7 +266,7 @@ void x25_link_device_up(struct net_device *dev)
 				       X25_MASK_PACKET_SIZE |
 				       X25_MASK_WINDOW_SIZE;
 	nb->t20      = sysctl_x25_restart_request_timeout;
-	atomic_set(&nb->refcnt, 1);
+	refcount_set(&nb->refcnt, 1);
 
 	write_lock_bh(&x25_neigh_list_lock);
 	list_add(&nb->node, &x25_neigh_list);
-- 
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