Skip to content

Commit

Permalink
net, atm: convert lec_arp_table.usage 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 <[email protected]>
Signed-off-by: Hans Liljestrand <[email protected]>
Signed-off-by: Kees Cook <[email protected]>
Signed-off-by: David Windsor <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
ereshetova authored and davem330 committed Jul 4, 2017
1 parent 458bc30 commit 7889366
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions net/atm/lec.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,12 @@ static void lec_vcc_close(struct lec_priv *priv, struct atm_vcc *vcc);
/* must be done under lec_arp_lock */
static inline void lec_arp_hold(struct lec_arp_table *entry)
{
atomic_inc(&entry->usage);
refcount_inc(&entry->usage);
}

static inline void lec_arp_put(struct lec_arp_table *entry)
{
if (atomic_dec_and_test(&entry->usage))
if (refcount_dec_and_test(&entry->usage))
kfree(entry);
}

Expand Down Expand Up @@ -1564,7 +1564,7 @@ static struct lec_arp_table *make_entry(struct lec_priv *priv,
to_return->last_used = jiffies;
to_return->priv = priv;
skb_queue_head_init(&to_return->tx_wait);
atomic_set(&to_return->usage, 1);
refcount_set(&to_return->usage, 1);
return to_return;
}

Expand Down
2 changes: 1 addition & 1 deletion net/atm/lec_arpc.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ struct lec_arp_table {
* the length of the tlvs array
*/
struct sk_buff_head tx_wait; /* wait queue for outgoing packets */
atomic_t usage; /* usage count */
refcount_t usage; /* usage count */
};

/*
Expand Down

0 comments on commit 7889366

Please sign in to comment.