Commit 57ab0485 authored by Jiang Liu's avatar Jiang Liu Committed by Greg Kroah-Hartman

zram: use zram->lock to protect zram_free_page() in swap free notify path

zram_slot_free_notify() is free-running without any protection from
concurrent operations. So there are race conditions between
zram_bvec_read()/zram_bvec_write() and zram_slot_free_notify(),
and possible consequences include:
1) Trigger BUG_ON(!handle) on zram_bvec_write() side.
2) Access to freed pages on zram_bvec_read() side.
3) Break some fields (bad_compress, good_compress, pages_stored)
   in zram->stats if the swap layer makes concurrently call to
   zram_slot_free_notify().

So enhance zram_slot_free_notify() to acquire writer lock on zram->lock
before calling zram_free_page().
Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6030ea9b
...@@ -582,7 +582,9 @@ static void zram_slot_free_notify(struct block_device *bdev, ...@@ -582,7 +582,9 @@ static void zram_slot_free_notify(struct block_device *bdev,
struct zram *zram; struct zram *zram;
zram = bdev->bd_disk->private_data; zram = bdev->bd_disk->private_data;
down_write(&zram->lock);
zram_free_page(zram, index); zram_free_page(zram, index);
up_write(&zram->lock);
zram_stat64_inc(zram, &zram->stats.notify_free); zram_stat64_inc(zram, &zram->stats.notify_free);
} }
......
...@@ -93,8 +93,9 @@ struct zram_meta { ...@@ -93,8 +93,9 @@ struct zram_meta {
struct zram { struct zram {
struct zram_meta *meta; struct zram_meta *meta;
spinlock_t stat64_lock; /* protect 64-bit stats */ spinlock_t stat64_lock; /* protect 64-bit stats */
struct rw_semaphore lock; /* protect compression buffers and table struct rw_semaphore lock; /* protect compression buffers, table,
* against concurrent read and writes */ * 32bit stat counters against concurrent
* notifications, reads and writes */
struct request_queue *queue; struct request_queue *queue;
struct gendisk *disk; struct gendisk *disk;
int init_done; int init_done;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment