lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: zram: prevent accessing an unallocated table when init fails early

Browse Source 
When the allocation of zram->table fails, we set zram->disksize to zero
to prevent accessing the unallocated table entries during cleanup.
However, we currently don't take this precaution when the initialization
fails earlier.

Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jerome Marchand
2011-09-06 15:02:12 +02:00
committed by Greg Kroah-Hartman
parent 0900beae17
commit 5a18c53147
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/zram/zram_drv.c
View File

@@ -651,24 +651,22 @@ int zram_init_device(struct zram *zram)
if (!zram->compress_workmem) { if (!zram->compress_workmem) {
pr_err("Error allocating compressor working memory!\n"); pr_err("Error allocating compressor working memory!\n");
ret = -ENOMEM; ret = -ENOMEM;
goto fail; goto fail_no_table;
} }
zram->compress_buffer = (void *)__get_free_pages(__GFP_ZERO, 1); zram->compress_buffer = (void *)__get_free_pages(__GFP_ZERO, 1);
if (!zram->compress_buffer) { if (!zram->compress_buffer) {
pr_err("Error allocating compressor buffer space\n"); pr_err("Error allocating compressor buffer space\n");
ret = -ENOMEM; ret = -ENOMEM;
goto fail; goto fail_no_table;
} }
num_pages = zram->disksize >> PAGE_SHIFT; num_pages = zram->disksize >> PAGE_SHIFT;
zram->table = vzalloc(num_pages * sizeof(*zram->table)); zram->table = vzalloc(num_pages * sizeof(*zram->table));
if (!zram->table) { if (!zram->table) {
pr_err("Error allocating zram address table\n"); pr_err("Error allocating zram address table\n");
/* To prevent accessing table entries during cleanup */
zram->disksize = 0;
ret = -ENOMEM; ret = -ENOMEM;
goto fail; goto fail_no_table;
} }
set_capacity(zram->disk, zram->disksize >> SECTOR_SHIFT); set_capacity(zram->disk, zram->disksize >> SECTOR_SHIFT);
@@ -689,6 +687,9 @@ int zram_init_device(struct zram *zram)
pr_debug("Initialization done!\n"); pr_debug("Initialization done!\n");
return 0; return 0;
fail_no_table:
/* To prevent accessing table entries during cleanup */
zram->disksize = 0;
fail: fail:
__zram_reset_device(zram); __zram_reset_device(zram);
up_write(&zram->init_lock); up_write(&zram->init_lock);