Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b19b8d4 authored by Robert Jennings's avatar Robert Jennings Committed by Greg Kroah-Hartman
Browse files

zram: Prevent overflow in logical block size 



On a 64K page kernel, the value PAGE_SIZE passed to
blk_queue_logical_block_size would overflow the logical block size
argument (resulting in setting it to 0).

This patch sets the logical block size to 4096, using a new
ZRAM_LOGICAL_BLOCK_SIZE constant.

Signed-off-by: default avatarRobert Jennings <rcj@linux.vnet.ibm.com>
Reviewed-by: default avatarPekka Enberg <penberg@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f3bc232c

drivers/staging/zram/zram_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -616,7 +616,8 @@ static int create_device(struct zram *zram, int device_id) 
	 * and n*PAGE_SIZED sized I/O requests.

	 */

	blk_queue_physical_block_size(zram->disk->queue, PAGE_SIZE);

	blk_queue_logical_block_size(zram->disk->queue, PAGE_SIZE);

	blk_queue_logical_block_size(zram->disk->queue,

					ZRAM_LOGICAL_BLOCK_SIZE);

	blk_queue_io_min(zram->disk->queue, PAGE_SIZE);

	blk_queue_io_opt(zram->disk->queue, PAGE_SIZE);

drivers/staging/zram/zram_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ static const unsigned max_zpage_size = PAGE_SIZE / 4 * 3; 
#define SECTOR_SIZE		(1 << SECTOR_SHIFT)

#define SECTORS_PER_PAGE_SHIFT	(PAGE_SHIFT - SECTOR_SHIFT)

#define SECTORS_PER_PAGE	(1 << SECTORS_PER_PAGE_SHIFT)

#define ZRAM_LOGICAL_BLOCK_SIZE	4096



/* Flags for zram pages (table[page_no].flags) */

enum zram_pageflags {