Skip to content

Commit

Permalink
dm: convert table_device.count from atomic_t to refcount_t
Browse files Browse the repository at this point in the history
atomic_t variables are currently used to implement reference
counters with the following properties:
 - counter is initialized to 1 using atomic_set()
 - a resource is freed upon counter reaching zero
 - once counter reaches zero, its further
   increments aren't allowed
 - counter schema uses basic atomic operations
   (set, inc, inc_not_zero, dec_and_test, etc.)

Such atomic variables should be converted to a newly provided
refcount_t type and API that prevents accidental counter overflows
and underflows. This is important since overflows and underflows
can lead to use-after-free situation and be exploitable.

The variable table_device.count is used as pure reference counter.
Convert it to refcount_t and fix up the operations.

Suggested-by: Kees Cook <[email protected]>
Reviewed-by: David Windsor <[email protected]>
Reviewed-by: Hans Liljestrand <[email protected]>
Signed-off-by: Elena Reshetova <[email protected]>
Signed-off-by: Mike Snitzer <[email protected]>
  • Loading branch information
ereshetova authored and snitm committed Oct 24, 2017
1 parent 2a0b468 commit b0b4d7c
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions drivers/md/dm.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <linux/delay.h>
#include <linux/wait.h>
#include <linux/pr.h>
#include <linux/refcount.h>

#define DM_MSG_PREFIX "core"

Expand Down Expand Up @@ -98,7 +99,7 @@ struct dm_md_mempools {

struct table_device {
struct list_head list;
atomic_t count;
refcount_t count;
struct dm_dev dm_dev;
};

Expand Down Expand Up @@ -685,10 +686,11 @@ int dm_get_table_device(struct mapped_device *md, dev_t dev, fmode_t mode,

format_dev_t(td->dm_dev.name, dev);

atomic_set(&td->count, 0);
refcount_set(&td->count, 1);
list_add(&td->list, &md->table_devices);
} else {
refcount_inc(&td->count);
}
atomic_inc(&td->count);
mutex_unlock(&md->table_devices_lock);

*result = &td->dm_dev;
Expand All @@ -701,7 +703,7 @@ void dm_put_table_device(struct mapped_device *md, struct dm_dev *d)
struct table_device *td = container_of(d, struct table_device, dm_dev);

mutex_lock(&md->table_devices_lock);
if (atomic_dec_and_test(&td->count)) {
if (refcount_dec_and_test(&td->count)) {
close_table_device(td, md);
list_del(&td->list);
kfree(td);
Expand All @@ -718,7 +720,7 @@ static void free_table_devices(struct list_head *devices)
struct table_device *td = list_entry(tmp, struct table_device, list);

DMWARN("dm_destroy: %s still exists with %d references",
td->dm_dev.name, atomic_read(&td->count));
td->dm_dev.name, refcount_read(&td->count));
kfree(td);
}
}
Expand Down

0 comments on commit b0b4d7c

Please sign in to comment.