Commit 5f9ccf6f authored by Reshetova, Elena's avatar Reshetova, Elena Committed by David S. Miller

net, x25: convert x25_route.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: default avatarElena Reshetova <elena.reshetova@intel.com>
Signed-off-by: default avatarHans Liljestrand <ishkamiel@gmail.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDavid Windsor <dwindsor@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6c5a1c4a
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#define _X25_H #define _X25_H
#include <linux/x25.h> #include <linux/x25.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/refcount.h>
#include <net/sock.h> #include <net/sock.h>
#define X25_ADDR_LEN 16 #define X25_ADDR_LEN 16
...@@ -129,7 +130,7 @@ struct x25_route { ...@@ -129,7 +130,7 @@ struct x25_route {
struct x25_address address; struct x25_address address;
unsigned int sigdigits; unsigned int sigdigits;
struct net_device *dev; struct net_device *dev;
atomic_t refcnt; refcount_t refcnt;
}; };
struct x25_neigh { struct x25_neigh {
...@@ -265,12 +266,12 @@ void x25_route_free(void); ...@@ -265,12 +266,12 @@ void x25_route_free(void);
static __inline__ void x25_route_hold(struct x25_route *rt) static __inline__ void x25_route_hold(struct x25_route *rt)
{ {
atomic_inc(&rt->refcnt); refcount_inc(&rt->refcnt);
} }
static __inline__ void x25_route_put(struct x25_route *rt) static __inline__ void x25_route_put(struct x25_route *rt)
{ {
if (atomic_dec_and_test(&rt->refcnt)) if (refcount_dec_and_test(&rt->refcnt))
kfree(rt); kfree(rt);
} }
......
...@@ -55,7 +55,7 @@ static int x25_add_route(struct x25_address *address, unsigned int sigdigits, ...@@ -55,7 +55,7 @@ static int x25_add_route(struct x25_address *address, unsigned int sigdigits,
rt->sigdigits = sigdigits; rt->sigdigits = sigdigits;
rt->dev = dev; rt->dev = dev;
atomic_set(&rt->refcnt, 1); refcount_set(&rt->refcnt, 1);
list_add(&rt->node, &x25_route_list); list_add(&rt->node, &x25_route_list);
rc = 0; rc = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment