lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 24 Aug 2010 15:39:31 +0800 From: Cong Meng <mcpacino@...il.com> To: Alexander Viro <viro@...iv.linux.org.uk>, Christoph Hellwig <hch@....de>, Jens Axboe <jens.axboe@...cle.com>, Nick Piggin <npiggin@...e.de>, Andrew Morton <akpm@...ux-foundation.org>, linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org Subject: [PATCH] VFS buffer: calculate block-size correctly the invocation of __getblk(bdev, block, size) will cause kernel stall if the @size parameter is not equal to the block size of the block device saved in the inode struct. submit_bh() has the similar problem. this patch calculates the blocksize by the value i_blkbits saved in the inode struct. Signed-off-by: Cong Meng <mcpacino@...il.com> --- fs/buffer.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index 3e7dca2..f7f9d33 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -1051,10 +1051,7 @@ grow_buffers(struct block_device *bdev, sector_t block, int size) pgoff_t index; int sizebits; - sizebits = -1; - do { - sizebits++; - } while ((size << sizebits) < PAGE_SIZE); + sizebits = PAGE_CACHE_SHIFT - bdev->bd_inode->i_blkbits; index = block >> sizebits; @@ -2924,7 +2921,7 @@ int submit_bh(int rw, struct buffer_head * bh) */ bio = bio_alloc(GFP_NOIO, 1); - bio->bi_sector = bh->b_blocknr * (bh->b_size >> 9); + bio->bi_sector = bh->b_blocknr << (bh->b_bdev->bd_inode->i_blkbits - 9); bio->bi_bdev = bh->b_bdev; bio->bi_io_vec[0].bv_page = bh->b_page; bio->bi_io_vec[0].bv_len = bh->b_size; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists