diff options
| author | Reshetova, Elena <elena.reshetova@intel.com> | 2017-07-04 15:53:30 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-05 00:35:19 +0300 |
| commit | 39f25d42c04959f0ddb5b14b01b27ea221736509 (patch) | |
| tree | d4750770cd0abc22cc98669a8a734673a84b5424 | |
| parent | 07f2282fc6a169980b08cedf3beaf8334b7b9dde (diff) | |
| download | linux-39f25d42c04959f0ddb5b14b01b27ea221736509.tar.xz | |
net, ax25: convert ax25_route.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/ax25.h | 6 | ||||
| -rw-r--r-- | net/ax25/ax25_route.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/net/ax25.h b/include/net/ax25.h index edd82f0a4d27..e3467ba81f6e 100644 --- a/include/net/ax25.h +++ b/include/net/ax25.h @@ -185,7 +185,7 @@ typedef struct { typedef struct ax25_route { struct ax25_route *next; - atomic_t refcount; + refcount_t refcount; ax25_address callsign; struct net_device *dev; ax25_digi *digipeat; @@ -194,14 +194,14 @@ typedef struct ax25_route { static inline void ax25_hold_route(ax25_route *ax25_rt) { - atomic_inc(&ax25_rt->refcount); + refcount_inc(&ax25_rt->refcount); } void __ax25_put_route(ax25_route *ax25_rt); static inline void ax25_put_route(ax25_route *ax25_rt) { - if (atomic_dec_and_test(&ax25_rt->refcount)) + if (refcount_dec_and_test(&ax25_rt->refcount)) __ax25_put_route(ax25_rt); } diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c index e1fda27cb27c..0446b892618a 100644 --- a/net/ax25/ax25_route.c +++ b/net/ax25/ax25_route.c @@ -114,7 +114,7 @@ static int __must_check ax25_rt_add(struct ax25_routes_struct *route) return -ENOMEM; } - atomic_set(&ax25_rt->refcount, 1); + refcount_set(&ax25_rt->refcount, 1); ax25_rt->callsign = route->dest_addr; ax25_rt->dev = ax25_dev->dev; ax25_rt->digipeat = NULL; |