Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1309264

[PATCH] zram: don't call idr_remove() from zram_remove()

Show all headers | View raw

The use of idr_remove() is forbidden in the callback functions of
idr_for_each(). It is therefore unsafe to call idr_remove in
zram_remove().
This patch moves the call to idr_remove() from zram_remove() to
hot_remove_store(). In the detroy_devices() path, idrs are removed by
idr_destroy().
This solves an use-after-free detected by KASan.

Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
---
 drivers/block/zram/zram_drv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 47915d7..5e86e1d 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1325,7 +1325,6 @@ static int zram_remove(struct zram *zram)
 
 	pr_info("Removed device: %s\n", zram->disk->disk_name);
 
-	idr_remove(&zram_index_idr, zram->disk->first_minor);
 	blk_cleanup_queue(zram->disk->queue);
 	del_gendisk(zram->disk);
 	put_disk(zram->disk);
@@ -1367,9 +1366,10 @@ static ssize_t hot_remove_store(struct class *class,
 	mutex_lock(&zram_index_mutex);
 
 	zram = idr_find(&zram_index_idr, dev_id);
-	if (zram)
+	if (zram) {
 		ret = zram_remove(zram);
-	else
+		idr_remove(&zram_index_idr, dev_id);
+	} else
 		ret = -ENODEV;
 
 	mutex_unlock(&zram_index_mutex);
-- 
2.5.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] zram: don't call idr_remove() from zram_remove() "Jerome Marchand" <jmarchan@redhat.com> - 2016-01-14 14:10 +0100
  Re: [PATCH] zram: don't call idr_remove() from zram_remove() Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> - 2016-01-15 01:50 +0100
    Re: [PATCH] zram: don't call idr_remove() from zram_remove() Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> - 2016-01-15 02:30 +0100
  Re: [PATCH] zram: don't call idr_remove() from zram_remove() Minchan Kim <minchan@kernel.org> - 2016-01-15 04:00 +0100

csiph-web