Skip to content

Commit

Permalink
audit: convert audit_tree.count 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]>
[PM: fix subject line, add #include]
Signed-off-by: Paul Moore <[email protected]>
  • Loading branch information
ereshetova authored and pcmoore committed May 2, 2017
1 parent 2173c51 commit 9d2378f
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions kernel/audit_tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
#include <linux/namei.h>
#include <linux/mount.h>
#include <linux/kthread.h>
#include <linux/refcount.h>
#include <linux/slab.h>

struct audit_tree;
struct audit_chunk;

struct audit_tree {
atomic_t count;
refcount_t count;
int goner;
struct audit_chunk *root;
struct list_head chunks;
Expand Down Expand Up @@ -77,7 +78,7 @@ static struct audit_tree *alloc_tree(const char *s)

tree = kmalloc(sizeof(struct audit_tree) + strlen(s) + 1, GFP_KERNEL);
if (tree) {
atomic_set(&tree->count, 1);
refcount_set(&tree->count, 1);
tree->goner = 0;
INIT_LIST_HEAD(&tree->chunks);
INIT_LIST_HEAD(&tree->rules);
Expand All @@ -91,12 +92,12 @@ static struct audit_tree *alloc_tree(const char *s)

static inline void get_tree(struct audit_tree *tree)
{
atomic_inc(&tree->count);
refcount_inc(&tree->count);
}

static inline void put_tree(struct audit_tree *tree)
{
if (atomic_dec_and_test(&tree->count))
if (refcount_dec_and_test(&tree->count))
kfree_rcu(tree, head);
}

Expand Down

0 comments on commit 9d2378f

Please sign in to comment.