summaryrefslogtreecommitdiffstats
path: root/drivers/staging/zram
diff options
context:
space:
mode:
authorJiang Liu2013-06-06 18:07:27 +0200
committerGreg Kroah-Hartman2013-06-06 21:12:20 +0200
commit5863e10b441e7ea4b492f930f1be180a97d026f3 (patch)
treebad382bb83312dc87593623961747e00ff1d9ad6 /drivers/staging/zram
parentzram: avoid access beyond the zram device (diff)
downloadkernel-qcow2-linux-5863e10b441e7ea4b492f930f1be180a97d026f3.tar.gz
kernel-qcow2-linux-5863e10b441e7ea4b492f930f1be180a97d026f3.tar.xz
kernel-qcow2-linux-5863e10b441e7ea4b492f930f1be180a97d026f3.zip
zram: protect sysfs handler from invalid memory access
Use zram->init_lock to protect access to zram->meta, otherwise it may cause invalid memory access if zram->meta has been freed by zram_reset_device(). This issue may be triggered by: Thread 1: while true; do cat mem_used_total; done Thread 2: while true; do echo 8M > disksize; echo 1 > reset; done Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Acked-by: Minchan Kim <minchan@kernel.org> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/zram')
-rw-r--r--drivers/staging/zram/zram_sysfs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/zram/zram_sysfs.c b/drivers/staging/zram/zram_sysfs.c
index e6a929d452f7..dc76a3dba1b8 100644
--- a/drivers/staging/zram/zram_sysfs.c
+++ b/drivers/staging/zram/zram_sysfs.c
@@ -188,8 +188,10 @@ static ssize_t mem_used_total_show(struct device *dev,
struct zram *zram = dev_to_zram(dev);
struct zram_meta *meta = zram->meta;
+ down_read(&zram->init_lock);
if (zram->init_done)
val = zs_get_total_size_bytes(meta->mem_pool);
+ up_read(&zram->init_lock);
return sprintf(buf, "%llu\n", val);
}