diff options
| author | Reshetova, Elena <elena.reshetova@intel.com> | 2017-07-04 15:53:12 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-05 00:35:17 +0300 |
| commit | 156be7edc85b4aeb0f31029f4d60c3de0c997f27 (patch) | |
| tree | fc2372b7477504eebe7a436692269d200390f3b8 | |
| parent | af4207494d9c8e089df80e9c1ceac44f2b3e7b53 (diff) | |
| download | linux-156be7edc85b4aeb0f31029f4d60c3de0c997f27.tar.xz | |
net, netrom: convert nr_node.refcount 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/netrom.h | 6 | ||||
| -rw-r--r-- | net/netrom/nr_route.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/net/netrom.h b/include/net/netrom.h index cecb4fde0243..443a4ffca7aa 100644 --- a/include/net/netrom.h +++ b/include/net/netrom.h @@ -110,7 +110,7 @@ struct nr_node { unsigned char which; unsigned char count; struct nr_route routes[3]; - atomic_t refcount; + refcount_t refcount; spinlock_t node_lock; }; @@ -119,11 +119,11 @@ struct nr_node { *********************************************************************/ #define nr_node_hold(__nr_node) \ - atomic_inc(&((__nr_node)->refcount)) + refcount_inc(&((__nr_node)->refcount)) static __inline__ void nr_node_put(struct nr_node *nr_node) { - if (atomic_dec_and_test(&nr_node->refcount)) { + if (refcount_dec_and_test(&nr_node->refcount)) { kfree(nr_node); } } diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c index 6b72970a0d6a..0c59354e280e 100644 --- a/net/netrom/nr_route.c +++ b/net/netrom/nr_route.c @@ -184,7 +184,7 @@ static int __must_check nr_add_node(ax25_address *nr, const char *mnemonic, nr_node->which = 0; nr_node->count = 1; - atomic_set(&nr_node->refcount, 1); + refcount_set(&nr_node->refcount, 1); spin_lock_init(&nr_node->node_lock); nr_node->routes[0].quality = quality; |