提交 affa78bc 编写于 作者: R Reshetova, Elena 提交者: David S. Miller

net, ipv6: convert ifacaddr6.aca_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: NElena Reshetova <elena.reshetova@intel.com>
Signed-off-by: NHans Liljestrand <ishkamiel@gmail.com>
Signed-off-by: NKees Cook <keescook@chromium.org>
Signed-off-by: NDavid Windsor <dwindsor@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 d3981bc6
...@@ -147,7 +147,7 @@ struct ifacaddr6 { ...@@ -147,7 +147,7 @@ struct ifacaddr6 {
struct rt6_info *aca_rt; struct rt6_info *aca_rt;
struct ifacaddr6 *aca_next; struct ifacaddr6 *aca_next;
int aca_users; int aca_users;
atomic_t aca_refcnt; refcount_t aca_refcnt;
unsigned long aca_cstamp; unsigned long aca_cstamp;
unsigned long aca_tstamp; unsigned long aca_tstamp;
}; };
......
...@@ -203,12 +203,12 @@ void ipv6_sock_ac_close(struct sock *sk) ...@@ -203,12 +203,12 @@ void ipv6_sock_ac_close(struct sock *sk)
static void aca_get(struct ifacaddr6 *aca) static void aca_get(struct ifacaddr6 *aca)
{ {
atomic_inc(&aca->aca_refcnt); refcount_inc(&aca->aca_refcnt);
} }
static void aca_put(struct ifacaddr6 *ac) 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); in6_dev_put(ac->aca_idev);
dst_release(&ac->aca_rt->dst); dst_release(&ac->aca_rt->dst);
kfree(ac); kfree(ac);
...@@ -232,7 +232,7 @@ static struct ifacaddr6 *aca_alloc(struct rt6_info *rt, ...@@ -232,7 +232,7 @@ static struct ifacaddr6 *aca_alloc(struct rt6_info *rt,
aca->aca_users = 1; aca->aca_users = 1;
/* aca_tstamp should be updated upon changes */ /* aca_tstamp should be updated upon changes */
aca->aca_cstamp = aca->aca_tstamp = jiffies; aca->aca_cstamp = aca->aca_tstamp = jiffies;
atomic_set(&aca->aca_refcnt, 1); refcount_set(&aca->aca_refcnt, 1);
return aca; return aca;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册