net, ipv6: convert ip6addrlbl_entry.refcnt from atomic_t to refcount_t
authorReshetova, Elena <elena.reshetova@intel.com>
Tue, 4 Jul 2017 06:35:00 +0000 (09:35 +0300)
committerDavid S. Miller <davem@davemloft.net>
Tue, 4 Jul 2017 08:29:04 +0000 (01:29 -0700)
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>
net/ipv6/addrlabel.c

index 07cd7d248bb6822b787e4c74c8ef3d27d38e9d99..7a428f65c7ece0b7155e26ba4afbf9e37f7f8690 100644 (file)
@@ -18,6 +18,7 @@
 #include <linux/if_addrlabel.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
+#include <linux/refcount.h>
 
 #if 0
 #define ADDRLABEL(x...) printk(x)
@@ -36,7 +37,7 @@ struct ip6addrlbl_entry {
        int addrtype;
        u32 label;
        struct hlist_node list;
-       atomic_t refcnt;
+       refcount_t refcnt;
        struct rcu_head rcu;
 };
 
@@ -137,12 +138,12 @@ static void ip6addrlbl_free_rcu(struct rcu_head *h)
 
 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)
 {
-       if (atomic_dec_and_test(&p->refcnt))
+       if (refcount_dec_and_test(&p->refcnt))
                call_rcu(&p->rcu, ip6addrlbl_free_rcu);
 }
 
@@ -236,7 +237,7 @@ static struct ip6addrlbl_entry *ip6addrlbl_alloc(struct net *net,
        newp->label = label;
        INIT_HLIST_NODE(&newp->list);
        write_pnet(&newp->lbl_net, net);
-       atomic_set(&newp->refcnt, 1);
+       refcount_set(&newp->refcnt, 1);
        return newp;
 }