Skip to content

Commit

Permalink
[PATCH] dm: add module ref counting
Browse files Browse the repository at this point in the history
The reference counting on dm-mod is zero if no mapped devices are open.  This
is incorrect, and can lead to an oops if the module is unloaded while mapped
devices exist.

This patch claims a reference to the module whenever a device is created, and
drops it again when the device is freed.

Devices must be removed before dm-mod is unloaded.

[akpm: too late for 2.6.17 - suitable for 2.6.17.x after it has settled]

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jeff Mahoney authored and Linus Torvalds committed Jun 26, 2006
1 parent 7ec75f2 commit 10da4f7
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/md/dm.c
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,9 @@ static struct mapped_device *alloc_dev(unsigned int minor, int persistent)
return NULL;
}

if (!try_module_get(THIS_MODULE))
goto bad0;

/* get a minor number for the dev */
r = persistent ? specific_minor(md, minor) : next_free_minor(md, &minor);
if (r < 0)
Expand Down Expand Up @@ -918,6 +921,8 @@ static struct mapped_device *alloc_dev(unsigned int minor, int persistent)
blk_cleanup_queue(md->queue);
free_minor(minor);
bad1:
module_put(THIS_MODULE);
bad0:
kfree(md);
return NULL;
}
Expand All @@ -941,6 +946,7 @@ static void free_dev(struct mapped_device *md)

put_disk(md->disk);
blk_cleanup_queue(md->queue);
module_put(THIS_MODULE);
kfree(md);
}

Expand Down

0 comments on commit 10da4f7

Please sign in to comment.