diff options
| author |   Reshetova, Elena <elena.reshetova@intel.com> | 2017-07-04 15:53:20 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-07-04 22:35:18 +0100 |
| commit | 5534a51ab79f8925ee33d9830646f5e6df27eb54 (patch) | |
| tree | 156a0d789daffb657852bf98d9566c7d1ccfeb12 | |
| parent | net, x25: convert x25_route.refcnt from atomic_t to refcount_t (diff) | |
| download | linux-dev-5534a51ab79f8925ee33d9830646f5e6df27eb54.tar.xz linux-dev-5534a51ab79f8925ee33d9830646f5e6df27eb54.zip | |
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>
| -rw-r--r-- | include/net/x25.h | 6 | ||||
| -rw-r--r-- | 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 1ac14006bf78..2609b57bd459 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 bcaa180d6a3f..e0cd04d28352 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); |