From: Elena Reshetova <elena.reshetova@intel.com>
To: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, davem@davemloft.net,
jmorris@namei.org, kaber@trash.net, yoshfuji@linux-ipv6.org,
steffen.klassert@secunet.com, kuznet@ms2.inr.ac.ru,
peterz@infradead.org, keescook@chromium.org,
Elena Reshetova <elena.reshetova@intel.com>,
Hans Liljestrand <ishkamiel@gmail.com>,
David Windsor <dwindsor@gmail.com>
Subject: [PATCH 5/9] net, ipv6: convert ifacaddr6.aca_refcnt from atomic_t to refcount_t
Date: Thu, 16 Mar 2017 20:23:27 +0200 [thread overview]
Message-ID: <1489688611-4542-6-git-send-email-elena.reshetova@intel.com> (raw)
In-Reply-To: <1489688611-4542-1-git-send-email-elena.reshetova@intel.com>
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>
---
include/net/if_inet6.h | 2 +-
net/ipv6/anycast.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 4bb52ce..d4088d1 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -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;
};
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
index 514ac25..0bbab8a 100644
--- a/net/ipv6/anycast.c
+++ b/net/ipv6/anycast.c
@@ -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);
@@ -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;
}
--
2.7.4
next prev parent reply other threads:[~2017-03-16 18:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-16 18:23 [PATCH 0/9] net, ipv4, ipv6 refcounter conversions Elena Reshetova
2017-03-16 18:23 ` [PATCH 1/9] net, ipv6: convert ipv6_txoptions.refcnt from atomic_t to refcount_t Elena Reshetova
2017-03-16 18:23 ` [PATCH 2/9] net, ipv6: convert inet6_dev.refcnt " Elena Reshetova
2017-03-16 18:23 ` [PATCH 3/9] net, ipv6: convert inet6_ifaddr.refcnt " Elena Reshetova
2017-03-16 18:23 ` [PATCH 4/9] net, ipv6: convert ifmcaddr6.mca_refcnt " Elena Reshetova
2017-03-16 18:23 ` Elena Reshetova [this message]
2017-03-16 18:23 ` [PATCH 6/9] net, ipv6: convert xfrm6_tunnel_spi.refcnt " Elena Reshetova
2017-03-16 18:23 ` [PATCH 7/9] net, ipv6: convert ip6addrlbl_entry.refcnt " Elena Reshetova
2017-03-16 18:23 ` [PATCH 8/9] net, ipv4: convert cipso_v4_doi.refcount " Elena Reshetova
2017-03-16 18:23 ` [PATCH 9/9] net, ipv4: convert fib_info.fib_clntref " Elena Reshetova
2017-07-04 6:34 [PATCH 0/9] v2 ipv4/ipv6 refcount conversions Elena Reshetova
2017-07-04 6:34 ` [PATCH 5/9] net, ipv6: convert ifacaddr6.aca_refcnt from atomic_t to refcount_t Elena Reshetova
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1489688611-4542-6-git-send-email-elena.reshetova@intel.com \
--to=elena.reshetova@intel.com \
--cc=davem@davemloft.net \
--cc=dwindsor@gmail.com \
--cc=ishkamiel@gmail.com \
--cc=jmorris@namei.org \
--cc=kaber@trash.net \
--cc=keescook@chromium.org \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=steffen.klassert@secunet.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).