Commit 2671e9fc authored by David S. Miller's avatar David S. Miller

Merge branch 'ipv4-ipv6-refcount_t'

Elena Reshetova says:

====================
v2 ipv4/ipv6 refcount conversions

Changes in v2:
 * rebase on top of net-next
 * currently by default refcount_t = atomic_t (*) and uses all
   atomic standard operations unless CONFIG_REFCOUNT_FULL is enabled.
   This is a compromise for the systems that are critical on
   performance (such as net) and cannot accept even slight delay
   on the refcounter operations.

This series, for ipv4/ipv6 network components, replaces atomic_t reference
counters with the new refcount_t type and API (see include/linux/refcount.h).
By doing this we prevent intentional or accidental
underflows or overflows that can led to use-after-free vulnerabilities.

The patches are fully independent and can be cherry-picked separately.
In order to try with refcount functionality enabled in run-time,
CONFIG_REFCOUNT_FULL must be enabled.

NOTE: automatic kernel builder for some reason doesn't like all my
network branches and regularly times out the builds on these branches.
Suggestion for "waiting a day for a good coverage" doesn't work, as
we have seen with generic network conversions. So please wait for the
full report from kernel test rebot before merging further up.
This has been compile-tested in 116 configs, but 71 timed out (including
all s390-related configs again). I am trying to see if they can fix
build coverage for me in meanwhile.

* The respective change is currently merged into -next as
  "locking/refcount: Create unchecked atomic_t implementation".
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 25f4535a 0029c0de
...@@ -316,7 +316,7 @@ static inline struct inet6_dev *in6_dev_get(const struct net_device *dev) ...@@ -316,7 +316,7 @@ static inline struct inet6_dev *in6_dev_get(const struct net_device *dev)
rcu_read_lock(); rcu_read_lock();
idev = rcu_dereference(dev->ip6_ptr); idev = rcu_dereference(dev->ip6_ptr);
if (idev) if (idev)
atomic_inc(&idev->refcnt); refcount_inc(&idev->refcnt);
rcu_read_unlock(); rcu_read_unlock();
return idev; return idev;
} }
...@@ -332,36 +332,36 @@ void in6_dev_finish_destroy(struct inet6_dev *idev); ...@@ -332,36 +332,36 @@ void in6_dev_finish_destroy(struct inet6_dev *idev);
static inline void in6_dev_put(struct inet6_dev *idev) static inline void in6_dev_put(struct inet6_dev *idev)
{ {
if (atomic_dec_and_test(&idev->refcnt)) if (refcount_dec_and_test(&idev->refcnt))
in6_dev_finish_destroy(idev); in6_dev_finish_destroy(idev);
} }
static inline void __in6_dev_put(struct inet6_dev *idev) static inline void __in6_dev_put(struct inet6_dev *idev)
{ {
atomic_dec(&idev->refcnt); refcount_dec(&idev->refcnt);
} }
static inline void in6_dev_hold(struct inet6_dev *idev) static inline void in6_dev_hold(struct inet6_dev *idev)
{ {
atomic_inc(&idev->refcnt); refcount_inc(&idev->refcnt);
} }
void inet6_ifa_finish_destroy(struct inet6_ifaddr *ifp); void inet6_ifa_finish_destroy(struct inet6_ifaddr *ifp);
static inline void in6_ifa_put(struct inet6_ifaddr *ifp) static inline void in6_ifa_put(struct inet6_ifaddr *ifp)
{ {
if (atomic_dec_and_test(&ifp->refcnt)) if (refcount_dec_and_test(&ifp->refcnt))
inet6_ifa_finish_destroy(ifp); inet6_ifa_finish_destroy(ifp);
} }
static inline void __in6_ifa_put(struct inet6_ifaddr *ifp) static inline void __in6_ifa_put(struct inet6_ifaddr *ifp)
{ {
atomic_dec(&ifp->refcnt); refcount_dec(&ifp->refcnt);
} }
static inline void in6_ifa_hold(struct inet6_ifaddr *ifp) static inline void in6_ifa_hold(struct inet6_ifaddr *ifp)
{ {
atomic_inc(&ifp->refcnt); refcount_inc(&ifp->refcnt);
} }
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include <net/netlabel.h> #include <net/netlabel.h>
#include <net/request_sock.h> #include <net/request_sock.h>
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/refcount.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
/* known doi values */ /* known doi values */
...@@ -85,7 +86,7 @@ struct cipso_v4_doi { ...@@ -85,7 +86,7 @@ struct cipso_v4_doi {
} map; } map;
u8 tags[CIPSO_V4_TAG_MAXCNT]; u8 tags[CIPSO_V4_TAG_MAXCNT];
atomic_t refcount; refcount_t refcount;
struct list_head list; struct list_head list;
struct rcu_head rcu; struct rcu_head rcu;
}; };
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <net/snmp.h> #include <net/snmp.h>
#include <linux/ipv6.h> #include <linux/ipv6.h>
#include <linux/refcount.h>
/* inet6_dev.if_flags */ /* inet6_dev.if_flags */
...@@ -45,7 +46,7 @@ struct inet6_ifaddr { ...@@ -45,7 +46,7 @@ struct inet6_ifaddr {
/* In seconds, relative to tstamp. Expiry is at tstamp + HZ * lft. */ /* In seconds, relative to tstamp. Expiry is at tstamp + HZ * lft. */
__u32 valid_lft; __u32 valid_lft;
__u32 prefered_lft; __u32 prefered_lft;
atomic_t refcnt; refcount_t refcnt;
spinlock_t lock; spinlock_t lock;
int state; int state;
...@@ -126,7 +127,7 @@ struct ifmcaddr6 { ...@@ -126,7 +127,7 @@ struct ifmcaddr6 {
struct timer_list mca_timer; struct timer_list mca_timer;
unsigned int mca_flags; unsigned int mca_flags;
int mca_users; int mca_users;
atomic_t mca_refcnt; refcount_t mca_refcnt;
spinlock_t mca_lock; spinlock_t mca_lock;
unsigned long mca_cstamp; unsigned long mca_cstamp;
unsigned long mca_tstamp; unsigned long mca_tstamp;
...@@ -146,7 +147,7 @@ struct ifacaddr6 { ...@@ -146,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;
}; };
...@@ -187,7 +188,7 @@ struct inet6_dev { ...@@ -187,7 +188,7 @@ struct inet6_dev {
struct ifacaddr6 *ac_list; struct ifacaddr6 *ac_list;
rwlock_t lock; rwlock_t lock;
atomic_t refcnt; refcount_t refcnt;
__u32 if_flags; __u32 if_flags;
int dead; int dead;
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <net/inetpeer.h> #include <net/inetpeer.h>
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/refcount.h>
struct fib_config { struct fib_config {
u8 fc_dst_len; u8 fc_dst_len;
...@@ -105,7 +106,7 @@ struct fib_info { ...@@ -105,7 +106,7 @@ struct fib_info {
struct hlist_node fib_lhash; struct hlist_node fib_lhash;
struct net *fib_net; struct net *fib_net;
int fib_treeref; int fib_treeref;
atomic_t fib_clntref; refcount_t fib_clntref;
unsigned int fib_flags; unsigned int fib_flags;
unsigned char fib_dead; unsigned char fib_dead;
unsigned char fib_protocol; unsigned char fib_protocol;
...@@ -430,12 +431,12 @@ void free_fib_info(struct fib_info *fi); ...@@ -430,12 +431,12 @@ void free_fib_info(struct fib_info *fi);
static inline void fib_info_hold(struct fib_info *fi) static inline void fib_info_hold(struct fib_info *fi)
{ {
atomic_inc(&fi->fib_clntref); refcount_inc(&fi->fib_clntref);
} }
static inline void fib_info_put(struct fib_info *fi) static inline void fib_info_put(struct fib_info *fi)
{ {
if (atomic_dec_and_test(&fi->fib_clntref)) if (refcount_dec_and_test(&fi->fib_clntref))
free_fib_info(fi); free_fib_info(fi);
} }
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/ipv6.h> #include <linux/ipv6.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <linux/jhash.h> #include <linux/jhash.h>
#include <linux/refcount.h>
#include <net/if_inet6.h> #include <net/if_inet6.h>
#include <net/ndisc.h> #include <net/ndisc.h>
#include <net/flow.h> #include <net/flow.h>
...@@ -203,7 +204,7 @@ extern rwlock_t ip6_ra_lock; ...@@ -203,7 +204,7 @@ extern rwlock_t ip6_ra_lock;
*/ */
struct ipv6_txoptions { struct ipv6_txoptions {
atomic_t refcnt; refcount_t refcnt;
/* Length of this structure */ /* Length of this structure */
int tot_len; int tot_len;
...@@ -265,7 +266,7 @@ static inline struct ipv6_txoptions *txopt_get(const struct ipv6_pinfo *np) ...@@ -265,7 +266,7 @@ static inline struct ipv6_txoptions *txopt_get(const struct ipv6_pinfo *np)
rcu_read_lock(); rcu_read_lock();
opt = rcu_dereference(np->opt); opt = rcu_dereference(np->opt);
if (opt) { if (opt) {
if (!atomic_inc_not_zero(&opt->refcnt)) if (!refcount_inc_not_zero(&opt->refcnt))
opt = NULL; opt = NULL;
else else
opt = rcu_pointer_handoff(opt); opt = rcu_pointer_handoff(opt);
...@@ -276,7 +277,7 @@ static inline struct ipv6_txoptions *txopt_get(const struct ipv6_pinfo *np) ...@@ -276,7 +277,7 @@ static inline struct ipv6_txoptions *txopt_get(const struct ipv6_pinfo *np)
static inline void txopt_put(struct ipv6_txoptions *opt) static inline void txopt_put(struct ipv6_txoptions *opt)
{ {
if (opt && atomic_dec_and_test(&opt->refcnt)) if (opt && refcount_dec_and_test(&opt->refcnt))
kfree_rcu(opt, rcu); kfree_rcu(opt, rcu);
} }
......
...@@ -375,7 +375,7 @@ static struct cipso_v4_doi *cipso_v4_doi_search(u32 doi) ...@@ -375,7 +375,7 @@ static struct cipso_v4_doi *cipso_v4_doi_search(u32 doi)
struct cipso_v4_doi *iter; struct cipso_v4_doi *iter;
list_for_each_entry_rcu(iter, &cipso_v4_doi_list, list) list_for_each_entry_rcu(iter, &cipso_v4_doi_list, list)
if (iter->doi == doi && atomic_read(&iter->refcount)) if (iter->doi == doi && refcount_read(&iter->refcount))
return iter; return iter;
return NULL; return NULL;
} }
...@@ -429,7 +429,7 @@ int cipso_v4_doi_add(struct cipso_v4_doi *doi_def, ...@@ -429,7 +429,7 @@ int cipso_v4_doi_add(struct cipso_v4_doi *doi_def,
} }
} }
atomic_set(&doi_def->refcount, 1); refcount_set(&doi_def->refcount, 1);
spin_lock(&cipso_v4_doi_list_lock); spin_lock(&cipso_v4_doi_list_lock);
if (cipso_v4_doi_search(doi_def->doi)) { if (cipso_v4_doi_search(doi_def->doi)) {
...@@ -533,7 +533,7 @@ int cipso_v4_doi_remove(u32 doi, struct netlbl_audit *audit_info) ...@@ -533,7 +533,7 @@ int cipso_v4_doi_remove(u32 doi, struct netlbl_audit *audit_info)
ret_val = -ENOENT; ret_val = -ENOENT;
goto doi_remove_return; goto doi_remove_return;
} }
if (!atomic_dec_and_test(&doi_def->refcount)) { if (!refcount_dec_and_test(&doi_def->refcount)) {
spin_unlock(&cipso_v4_doi_list_lock); spin_unlock(&cipso_v4_doi_list_lock);
ret_val = -EBUSY; ret_val = -EBUSY;
goto doi_remove_return; goto doi_remove_return;
...@@ -576,7 +576,7 @@ struct cipso_v4_doi *cipso_v4_doi_getdef(u32 doi) ...@@ -576,7 +576,7 @@ struct cipso_v4_doi *cipso_v4_doi_getdef(u32 doi)
doi_def = cipso_v4_doi_search(doi); doi_def = cipso_v4_doi_search(doi);
if (!doi_def) if (!doi_def)
goto doi_getdef_return; goto doi_getdef_return;
if (!atomic_inc_not_zero(&doi_def->refcount)) if (!refcount_inc_not_zero(&doi_def->refcount))
doi_def = NULL; doi_def = NULL;
doi_getdef_return: doi_getdef_return:
...@@ -597,7 +597,7 @@ void cipso_v4_doi_putdef(struct cipso_v4_doi *doi_def) ...@@ -597,7 +597,7 @@ void cipso_v4_doi_putdef(struct cipso_v4_doi *doi_def)
if (!doi_def) if (!doi_def)
return; return;
if (!atomic_dec_and_test(&doi_def->refcount)) if (!refcount_dec_and_test(&doi_def->refcount))
return; return;
spin_lock(&cipso_v4_doi_list_lock); spin_lock(&cipso_v4_doi_list_lock);
list_del_rcu(&doi_def->list); list_del_rcu(&doi_def->list);
...@@ -630,7 +630,7 @@ int cipso_v4_doi_walk(u32 *skip_cnt, ...@@ -630,7 +630,7 @@ int cipso_v4_doi_walk(u32 *skip_cnt,
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(iter_doi, &cipso_v4_doi_list, list) list_for_each_entry_rcu(iter_doi, &cipso_v4_doi_list, list)
if (atomic_read(&iter_doi->refcount) > 0) { if (refcount_read(&iter_doi->refcount) > 0) {
if (doi_cnt++ < *skip_cnt) if (doi_cnt++ < *skip_cnt)
continue; continue;
ret_val = callback(iter_doi, cb_arg); ret_val = callback(iter_doi, cb_arg);
......
...@@ -1253,7 +1253,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, ...@@ -1253,7 +1253,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg,
} }
fi->fib_treeref++; fi->fib_treeref++;
atomic_inc(&fi->fib_clntref); refcount_set(&fi->fib_clntref, 1);
spin_lock_bh(&fib_info_lock); spin_lock_bh(&fib_info_lock);
hlist_add_head(&fi->fib_hash, hlist_add_head(&fi->fib_hash,
&fib_info_hash[fib_info_hashfn(fi)]); &fib_info_hash[fib_info_hashfn(fi)]);
......
...@@ -1463,7 +1463,7 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp, ...@@ -1463,7 +1463,7 @@ int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,
} }
if (!(fib_flags & FIB_LOOKUP_NOREF)) if (!(fib_flags & FIB_LOOKUP_NOREF))
atomic_inc(&fi->fib_clntref); refcount_inc(&fi->fib_clntref);
res->prefix = htonl(n->key); res->prefix = htonl(n->key);
res->prefixlen = KEYLENGTH - fa->fa_slen; res->prefixlen = KEYLENGTH - fa->fa_slen;
......
...@@ -426,7 +426,7 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev) ...@@ -426,7 +426,7 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev)
} }
/* One reference from device. */ /* One reference from device. */
in6_dev_hold(ndev); refcount_set(&ndev->refcnt, 1);
if (dev->flags & (IFF_NOARP | IFF_LOOPBACK)) if (dev->flags & (IFF_NOARP | IFF_LOOPBACK))
ndev->cnf.accept_dad = -1; ndev->cnf.accept_dad = -1;
...@@ -1050,7 +1050,7 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr, ...@@ -1050,7 +1050,7 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr,
ifa->idev = idev; ifa->idev = idev;
/* For caller */ /* For caller */
in6_ifa_hold(ifa); refcount_set(&ifa->refcnt, 1);
/* Add to big hash table */ /* Add to big hash table */
hash = inet6_addr_hash(addr); hash = inet6_addr_hash(addr);
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <linux/if_addrlabel.h> #include <linux/if_addrlabel.h>
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <linux/refcount.h>
#if 0 #if 0
#define ADDRLABEL(x...) printk(x) #define ADDRLABEL(x...) printk(x)
...@@ -36,7 +37,7 @@ struct ip6addrlbl_entry { ...@@ -36,7 +37,7 @@ struct ip6addrlbl_entry {
int addrtype; int addrtype;
u32 label; u32 label;
struct hlist_node list; struct hlist_node list;
atomic_t refcnt; refcount_t refcnt;
struct rcu_head rcu; struct rcu_head rcu;
}; };
...@@ -137,12 +138,12 @@ static void ip6addrlbl_free_rcu(struct rcu_head *h) ...@@ -137,12 +138,12 @@ static void ip6addrlbl_free_rcu(struct rcu_head *h)
static bool ip6addrlbl_hold(struct ip6addrlbl_entry *p) static bool ip6addrlbl_hold(struct ip6addrlbl_entry *p)
{ {
return atomic_inc_not_zero(&p->refcnt); return refcount_inc_not_zero(&p->refcnt);
} }
static inline void ip6addrlbl_put(struct ip6addrlbl_entry *p) static inline void ip6addrlbl_put(struct ip6addrlbl_entry *p)
{ {
if (atomic_dec_and_test(&p->refcnt)) if (refcount_dec_and_test(&p->refcnt))
call_rcu(&p->rcu, ip6addrlbl_free_rcu); call_rcu(&p->rcu, ip6addrlbl_free_rcu);
} }
...@@ -236,7 +237,7 @@ static struct ip6addrlbl_entry *ip6addrlbl_alloc(struct net *net, ...@@ -236,7 +237,7 @@ static struct ip6addrlbl_entry *ip6addrlbl_alloc(struct net *net,
newp->label = label; newp->label = label;
INIT_HLIST_NODE(&newp->list); INIT_HLIST_NODE(&newp->list);
write_pnet(&newp->lbl_net, net); write_pnet(&newp->lbl_net, net);
atomic_set(&newp->refcnt, 1); refcount_set(&newp->refcnt, 1);
return newp; return newp;
} }
......
...@@ -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;
} }
......
...@@ -971,7 +971,7 @@ ipv6_dup_options(struct sock *sk, struct ipv6_txoptions *opt) ...@@ -971,7 +971,7 @@ ipv6_dup_options(struct sock *sk, struct ipv6_txoptions *opt)
*((char **)&opt2->dst1opt) += dif; *((char **)&opt2->dst1opt) += dif;
if (opt2->srcrt) if (opt2->srcrt)
*((char **)&opt2->srcrt) += dif; *((char **)&opt2->srcrt) += dif;
atomic_set(&opt2->refcnt, 1); refcount_set(&opt2->refcnt, 1);
} }
return opt2; return opt2;
} }
...@@ -1056,7 +1056,7 @@ ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt, ...@@ -1056,7 +1056,7 @@ ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
return ERR_PTR(-ENOBUFS); return ERR_PTR(-ENOBUFS);
memset(opt2, 0, tot_len); memset(opt2, 0, tot_len);
atomic_set(&opt2->refcnt, 1); refcount_set(&opt2->refcnt, 1);
opt2->tot_len = tot_len; opt2->tot_len = tot_len;
p = (char *)(opt2 + 1); p = (char *)(opt2 + 1);
......
...@@ -505,7 +505,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, ...@@ -505,7 +505,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
break; break;
memset(opt, 0, sizeof(*opt)); memset(opt, 0, sizeof(*opt));
atomic_set(&opt->refcnt, 1); refcount_set(&opt->refcnt, 1);
opt->tot_len = sizeof(*opt) + optlen; opt->tot_len = sizeof(*opt) + optlen;
retv = -EFAULT; retv = -EFAULT;
if (copy_from_user(opt+1, optval, optlen)) if (copy_from_user(opt+1, optval, optlen))
......
...@@ -701,7 +701,7 @@ static void igmp6_group_dropped(struct ifmcaddr6 *mc) ...@@ -701,7 +701,7 @@ static void igmp6_group_dropped(struct ifmcaddr6 *mc)
spin_lock_bh(&mc->mca_lock); spin_lock_bh(&mc->mca_lock);
if (del_timer(&mc->mca_timer)) if (del_timer(&mc->mca_timer))
atomic_dec(&mc->mca_refcnt); refcount_dec(&mc->mca_refcnt);
spin_unlock_bh(&mc->mca_lock); spin_unlock_bh(&mc->mca_lock);
} }
...@@ -819,12 +819,12 @@ static void mld_clear_delrec(struct inet6_dev *idev) ...@@ -819,12 +819,12 @@ static void mld_clear_delrec(struct inet6_dev *idev)
static void mca_get(struct ifmcaddr6 *mc) static void mca_get(struct ifmcaddr6 *mc)
{ {
atomic_inc(&mc->mca_refcnt); refcount_inc(&mc->mca_refcnt);
} }
static void ma_put(struct ifmcaddr6 *mc) static void ma_put(struct ifmcaddr6 *mc)
{ {
if (atomic_dec_and_test(&mc->mca_refcnt)) { if (refcount_dec_and_test(&mc->mca_refcnt)) {
in6_dev_put(mc->idev); in6_dev_put(mc->idev);
kfree(mc); kfree(mc);
} }
...@@ -846,7 +846,7 @@ static struct ifmcaddr6 *mca_alloc(struct inet6_dev *idev, ...@@ -846,7 +846,7 @@ static struct ifmcaddr6 *mca_alloc(struct inet6_dev *idev,
mc->mca_users = 1; mc->mca_users = 1;
/* mca_stamp should be updated upon changes */ /* mca_stamp should be updated upon changes */
mc->mca_cstamp = mc->mca_tstamp = jiffies; mc->mca_cstamp = mc->mca_tstamp = jiffies;
atomic_set(&mc->mca_refcnt, 1); refcount_set(&mc->mca_refcnt, 1);
spin_lock_init(&mc->mca_lock); spin_lock_init(&mc->mca_lock);
/* initial mode is (EX, empty) */ /* initial mode is (EX, empty) */
...@@ -1065,7 +1065,7 @@ static void igmp6_group_queried(struct ifmcaddr6 *ma, unsigned long resptime) ...@@ -1065,7 +1065,7 @@ static void igmp6_group_queried(struct ifmcaddr6 *ma, unsigned long resptime)
return; return;
if (del_timer(&ma->mca_timer)) { if (del_timer(&ma->mca_timer)) {
atomic_dec(&ma->mca_refcnt); refcount_dec(&ma->mca_refcnt);
delay = ma->mca_timer.expires - jiffies; delay = ma->mca_timer.expires - jiffies;
} }
...@@ -1074,7 +1074,7 @@ static void igmp6_group_queried(struct ifmcaddr6 *ma, unsigned long resptime) ...@@ -1074,7 +1074,7 @@ static void igmp6_group_queried(struct ifmcaddr6 *ma, unsigned long resptime)
ma->mca_timer.expires = jiffies + delay; ma->mca_timer.expires = jiffies + delay;
if (!mod_timer(&ma->mca_timer, jiffies + delay)) if (!mod_timer(&ma->mca_timer, jiffies + delay))
atomic_inc(&ma->mca_refcnt); refcount_inc(&ma->mca_refcnt);
ma->mca_flags |= MAF_TIMER_RUNNING; ma->mca_flags |= MAF_TIMER_RUNNING;
} }
...@@ -1469,7 +1469,7 @@ int igmp6_event_report(struct sk_buff *skb) ...@@ -1469,7 +1469,7 @@ int igmp6_event_report(struct sk_buff *skb)
if (ipv6_addr_equal(&ma->mca_addr, &mld->mld_mca)) { if (ipv6_addr_equal(&ma->mca_addr, &mld->mld_mca)) {
spin_lock(&ma->mca_lock); spin_lock(&ma->mca_lock);
if (del_timer(&ma->mca_timer)) if (del_timer(&ma->mca_timer))
atomic_dec(&ma->mca_refcnt); refcount_dec(&ma->mca_refcnt);
ma->mca_flags &= ~(MAF_LAST_REPORTER|MAF_TIMER_RUNNING); ma->mca_flags &= ~(MAF_LAST_REPORTER|MAF_TIMER_RUNNING);
spin_unlock(&ma->mca_lock); spin_unlock(&ma->mca_lock);
break; break;
...@@ -2391,12 +2391,12 @@ static void igmp6_join_group(struct ifmcaddr6 *ma) ...@@ -2391,12 +2391,12 @@ static void igmp6_join_group(struct ifmcaddr6 *ma)
spin_lock_bh(&ma->mca_lock); spin_lock_bh(&ma->mca_lock);
if (del_timer(&ma->mca_timer)) { if (del_timer(&ma->mca_timer)) {
atomic_dec(&ma->mca_refcnt); refcount_dec(&ma->mca_refcnt);
delay = ma->mca_timer.expires - jiffies; delay = ma->mca_timer.expires - jiffies;
} }
if (!mod_timer(&ma->mca_timer, jiffies + delay)) if (!mod_timer(&ma->mca_timer, jiffies + delay))
atomic_inc(&ma->mca_refcnt); refcount_inc(&ma->mca_refcnt);
ma->mca_flags |= MAF_TIMER_RUNNING | MAF_LAST_REPORTER; ma->mca_flags |= MAF_TIMER_RUNNING | MAF_LAST_REPORTER;
spin_unlock_bh(&ma->mca_lock); spin_unlock_bh(&ma->mca_lock);
} }
......
...@@ -59,7 +59,7 @@ struct xfrm6_tunnel_spi { ...@@ -59,7 +59,7 @@ struct xfrm6_tunnel_spi {
struct hlist_node list_byspi; struct hlist_node list_byspi;
xfrm_address_t addr; xfrm_address_t addr;
u32 spi; u32 spi;
atomic_t refcnt; refcount_t refcnt;
struct rcu_head rcu_head; struct rcu_head rcu_head;
}; };
...@@ -160,7 +160,7 @@ static u32 __xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr) ...@@ -160,7 +160,7 @@ static u32 __xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr)
memcpy(&x6spi->addr, saddr, sizeof(x6spi->addr)); memcpy(&x6spi->addr, saddr, sizeof(x6spi->addr));
x6spi->spi = spi; x6spi->spi = spi;
atomic_set(&x6spi->refcnt, 1); refcount_set(&x6spi->refcnt, 1);
hlist_add_head_rcu(&x6spi->list_byspi, &xfrm6_tn->spi_byspi[index]); hlist_add_head_rcu(&x6spi->list_byspi, &xfrm6_tn->spi_byspi[index]);
...@@ -178,7 +178,7 @@ __be32 xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr) ...@@ -178,7 +178,7 @@ __be32 xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr)
spin_lock_bh(&xfrm6_tunnel_spi_lock); spin_lock_bh(&xfrm6_tunnel_spi_lock);
x6spi = __xfrm6_tunnel_spi_lookup(net, saddr); x6spi = __xfrm6_tunnel_spi_lookup(net, saddr);
if (x6spi) { if (x6spi) {
atomic_inc(&x6spi->refcnt); refcount_inc(&x6spi->refcnt);
spi = x6spi->spi; spi = x6spi->spi;
} else } else
spi = __xfrm6_tunnel_alloc_spi(net, saddr); spi = __xfrm6_tunnel_alloc_spi(net, saddr);
...@@ -207,7 +207,7 @@ static void xfrm6_tunnel_free_spi(struct net *net, xfrm_address_t *saddr) ...@@ -207,7 +207,7 @@ static void xfrm6_tunnel_free_spi(struct net *net, xfrm_address_t *saddr)
list_byaddr) list_byaddr)
{ {
if (xfrm6_addr_equal(&x6spi->addr, saddr)) { if (xfrm6_addr_equal(&x6spi->addr, saddr)) {
if (atomic_dec_and_test(&x6spi->refcnt)) { if (refcount_dec_and_test(&x6spi->refcnt)) {
hlist_del_rcu(&x6spi->list_byaddr); hlist_del_rcu(&x6spi->list_byaddr);
hlist_del_rcu(&x6spi->list_byspi); hlist_del_rcu(&x6spi->list_byspi);
call_rcu(&x6spi->rcu_head, x6spi_destroy_rcu); call_rcu(&x6spi->rcu_head, x6spi_destroy_rcu);
......
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