Skip to content

Commit

Permalink
net, ipv6: convert ifacaddr6.aca_refcnt from atomic_t to refcount_t
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Reshetova, Elena authored and David S. Miller committed Jul 4, 2017
1 parent d3981bc commit affa78b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion include/net/if_inet6.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ struct ifacaddr6 {
struct rt6_info *aca_rt;
struct ifacaddr6 *aca_next;
int aca_users;
atomic_t aca_refcnt;
refcount_t aca_refcnt;
unsigned long aca_cstamp;
unsigned long aca_tstamp;
};
Expand Down
6 changes: 3 additions & 3 deletions net/ipv6/anycast.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,12 @@ void ipv6_sock_ac_close(struct sock *sk)

static void aca_get(struct ifacaddr6 *aca)
{
atomic_inc(&aca->aca_refcnt);
refcount_inc(&aca->aca_refcnt);
}

static void aca_put(struct ifacaddr6 *ac)
{
if (atomic_dec_and_test(&ac->aca_refcnt)) {
if (refcount_dec_and_test(&ac->aca_refcnt)) {
in6_dev_put(ac->aca_idev);
dst_release(&ac->aca_rt->dst);
kfree(ac);
Expand All @@ -232,7 +232,7 @@ static struct ifacaddr6 *aca_alloc(struct rt6_info *rt,
aca->aca_users = 1;
/* aca_tstamp should be updated upon changes */
aca->aca_cstamp = aca->aca_tstamp = jiffies;
atomic_set(&aca->aca_refcnt, 1);
refcount_set(&aca->aca_refcnt, 1);

return aca;
}
Expand Down

0 comments on commit affa78b

Please sign in to comment.