summaryrefslogtreecommitdiffstats
path: root/include/net/x25.h
diff options
context:
space:
mode:
authorReshetova, Elena <elena.reshetova@intel.com>2017-07-04 08:53:20 -0400
committerDavid S. Miller <davem@davemloft.net>2017-07-04 17:35:18 -0400
commit5534a51ab79f8925ee33d9830646f5e6df27eb54 (patch)
tree156a0d789daffb657852bf98d9566c7d1ccfeb12 /include/net/x25.h
parent5f9ccf6f38a1cfbaf6920b843c09d4e847a89e98 (diff)
net, x25: convert x25_neigh.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: 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>
Diffstat (limited to 'include/net/x25.h')
-rw-r--r--include/net/x25.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/x25.h b/include/net/x25.h
index 1ac14006bf78..2609b57bd459 100644
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -142,7 +142,7 @@ struct x25_neigh {
142 unsigned long t20; 142 unsigned long t20;
143 struct timer_list t20timer; 143 struct timer_list t20timer;
144 unsigned long global_facil_mask; 144 unsigned long global_facil_mask;
145 atomic_t refcnt; 145 refcount_t refcnt;
146}; 146};
147 147
148struct x25_sock { 148struct x25_sock {
@@ -243,12 +243,12 @@ void x25_link_free(void);
243/* x25_neigh.c */ 243/* x25_neigh.c */
244static __inline__ void x25_neigh_hold(struct x25_neigh *nb) 244static __inline__ void x25_neigh_hold(struct x25_neigh *nb)
245{ 245{
246 atomic_inc(&nb->refcnt); 246 refcount_inc(&nb->refcnt);
247} 247}
248 248
249static __inline__ void x25_neigh_put(struct x25_neigh *nb) 249static __inline__ void x25_neigh_put(struct x25_neigh *nb)
250{ 250{
251 if (atomic_dec_and_test(&nb->refcnt)) 251 if (refcount_dec_and_test(&nb->refcnt))
252 kfree(nb); 252 kfree(nb);
253} 253}
254 254