Commit 16f73c96 authored by Reshetova, Elena's avatar Reshetova, Elena Committed by David S. Miller

net, ipx: convert ipx_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 d25189ca
...@@ -81,7 +81,7 @@ struct ipx_route { ...@@ -81,7 +81,7 @@ struct ipx_route {
unsigned char ir_routed; unsigned char ir_routed;
unsigned char ir_router_node[IPX_NODE_LEN]; unsigned char ir_router_node[IPX_NODE_LEN];
struct list_head node; /* node in ipx_routes list */ struct list_head node; /* node in ipx_routes list */
atomic_t refcnt; refcount_t refcnt;
}; };
struct ipx_cb { struct ipx_cb {
...@@ -164,12 +164,12 @@ static __inline__ void ipxitf_put(struct ipx_interface *intrfc) ...@@ -164,12 +164,12 @@ static __inline__ void ipxitf_put(struct ipx_interface *intrfc)
static __inline__ void ipxrtr_hold(struct ipx_route *rt) static __inline__ void ipxrtr_hold(struct ipx_route *rt)
{ {
atomic_inc(&rt->refcnt); refcount_inc(&rt->refcnt);
} }
static __inline__ void ipxrtr_put(struct ipx_route *rt) static __inline__ void ipxrtr_put(struct ipx_route *rt)
{ {
if (atomic_dec_and_test(&rt->refcnt)) if (refcount_dec_and_test(&rt->refcnt))
kfree(rt); kfree(rt);
} }
#endif /* _NET_INET_IPX_H_ */ #endif /* _NET_INET_IPX_H_ */
...@@ -59,7 +59,7 @@ int ipxrtr_add_route(__be32 network, struct ipx_interface *intrfc, ...@@ -59,7 +59,7 @@ int ipxrtr_add_route(__be32 network, struct ipx_interface *intrfc,
if (!rt) if (!rt)
goto out; goto out;
atomic_set(&rt->refcnt, 1); refcount_set(&rt->refcnt, 1);
ipxrtr_hold(rt); ipxrtr_hold(rt);
write_lock_bh(&ipx_routes_lock); write_lock_bh(&ipx_routes_lock);
list_add(&rt->node, &ipx_routes); list_add(&rt->node, &ipx_routes);
......
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