Commit 850a6212 authored by Reshetova, Elena's avatar Reshetova, Elena Committed by David S. Miller

net, xfrm: convert xfrm_policy.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 88755e9c
...@@ -560,7 +560,7 @@ struct xfrm_policy { ...@@ -560,7 +560,7 @@ struct xfrm_policy {
/* This lock only affects elements except for entry. */ /* This lock only affects elements except for entry. */
rwlock_t lock; rwlock_t lock;
atomic_t refcnt; refcount_t refcnt;
struct timer_list timer; struct timer_list timer;
struct flow_cache_object flo; struct flow_cache_object flo;
...@@ -816,14 +816,14 @@ static inline void xfrm_audit_state_icvfail(struct xfrm_state *x, ...@@ -816,14 +816,14 @@ static inline void xfrm_audit_state_icvfail(struct xfrm_state *x,
static inline void xfrm_pol_hold(struct xfrm_policy *policy) static inline void xfrm_pol_hold(struct xfrm_policy *policy)
{ {
if (likely(policy != NULL)) if (likely(policy != NULL))
atomic_inc(&policy->refcnt); refcount_inc(&policy->refcnt);
} }
void xfrm_policy_destroy(struct xfrm_policy *policy); void xfrm_policy_destroy(struct xfrm_policy *policy);
static inline void xfrm_pol_put(struct xfrm_policy *policy) static inline void xfrm_pol_put(struct xfrm_policy *policy)
{ {
if (atomic_dec_and_test(&policy->refcnt)) if (refcount_dec_and_test(&policy->refcnt))
xfrm_policy_destroy(policy); xfrm_policy_destroy(policy);
} }
......
...@@ -2177,7 +2177,7 @@ static int pfkey_xfrm_policy2msg(struct sk_buff *skb, const struct xfrm_policy * ...@@ -2177,7 +2177,7 @@ static int pfkey_xfrm_policy2msg(struct sk_buff *skb, const struct xfrm_policy *
} }
hdr->sadb_msg_len = size / sizeof(uint64_t); hdr->sadb_msg_len = size / sizeof(uint64_t);
hdr->sadb_msg_reserved = atomic_read(&xp->refcnt); hdr->sadb_msg_reserved = refcount_read(&xp->refcnt);
return 0; return 0;
} }
......
...@@ -62,7 +62,7 @@ static struct xfrm_policy *__xfrm_policy_unlink(struct xfrm_policy *pol, ...@@ -62,7 +62,7 @@ static struct xfrm_policy *__xfrm_policy_unlink(struct xfrm_policy *pol,
static inline bool xfrm_pol_hold_rcu(struct xfrm_policy *policy) static inline bool xfrm_pol_hold_rcu(struct xfrm_policy *policy)
{ {
return atomic_inc_not_zero(&policy->refcnt); return refcount_inc_not_zero(&policy->refcnt);
} }
static inline bool static inline bool
...@@ -292,7 +292,7 @@ struct xfrm_policy *xfrm_policy_alloc(struct net *net, gfp_t gfp) ...@@ -292,7 +292,7 @@ struct xfrm_policy *xfrm_policy_alloc(struct net *net, gfp_t gfp)
INIT_HLIST_NODE(&policy->bydst); INIT_HLIST_NODE(&policy->bydst);
INIT_HLIST_NODE(&policy->byidx); INIT_HLIST_NODE(&policy->byidx);
rwlock_init(&policy->lock); rwlock_init(&policy->lock);
atomic_set(&policy->refcnt, 1); refcount_set(&policy->refcnt, 1);
skb_queue_head_init(&policy->polq.hold_queue); skb_queue_head_init(&policy->polq.hold_queue);
setup_timer(&policy->timer, xfrm_policy_timer, setup_timer(&policy->timer, xfrm_policy_timer,
(unsigned long)policy); (unsigned long)policy);
......
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