diff options
| author | Minchan Kim <minchan@kernel.org> | 2014-03-03 15:38:34 -0800 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-06-12 21:19:56 +1000 |
| commit | 0378177cddc2351c087be43c0ef22fa60914611a (patch) | |
| tree | 0ed356fa7dcf7ccf8bf9db55d18649649c977cb4 /drivers | |
| parent | 8b555b9aa95ade2ccd262abb2ddd37ead2fdc00c (diff) | |
| download | kernel_samsung_smdk4412-0378177cddc2351c087be43c0ef22fa60914611a.zip kernel_samsung_smdk4412-0378177cddc2351c087be43c0ef22fa60914611a.tar.gz kernel_samsung_smdk4412-0378177cddc2351c087be43c0ef22fa60914611a.tar.bz2 | |
zram: avoid null access when fail to alloc meta
zram_meta_alloc could fail so caller should check it. Otherwise, your
system will hang.
Signed-off-by: Minchan Kim <minchan@kernel.org>
Acked-by: Jerome Marchand <jmarchan@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/zram/zram_drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 37296d3..4520cb8 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -623,6 +623,8 @@ static ssize_t disksize_store(struct device *dev, disksize = PAGE_ALIGN(disksize); meta = zram_meta_alloc(disksize); + if (!meta) + return -ENOMEM; down_write(&zram->init_lock); if (zram->init_done) { up_write(&zram->init_lock); |