Messages in this thread Patch in this message | | | Date | Mon, 22 Sep 2014 08:18:44 -0700 | Subject | Re: [PATCH] Fix nasty 32-bit overflow bug in buffer i/o code. | From | Linus Torvalds <> |
| |
On Sun, Sep 21, 2014 at 5:53 PM, Anton Altaparmakov <aia21@cam.ac.uk> wrote: > > This patch fixes this issue by type casting "index" to sector_t before > doing the left shift.
Ugh. Does the simpler patch to just pass in "block" work as well?
Linus fs/buffer.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/fs/buffer.c b/fs/buffer.c index 8f05111bbb8b..f32d6a3cff38 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -1021,8 +1021,7 @@ grow_dev_page(struct block_device *bdev, sector_t block, if (page_has_buffers(page)) { bh = page_buffers(page); if (bh->b_size == size) { - end_block = init_page_buffers(page, bdev, - index << sizebits, size); + end_block = init_page_buffers(page, bdev, block, size); goto done; } if (!try_to_free_buffers(page)) @@ -1043,7 +1042,7 @@ grow_dev_page(struct block_device *bdev, sector_t block, */ spin_lock(&inode->i_mapping->private_lock); link_dev_buffers(page, bh); - end_block = init_page_buffers(page, bdev, index << sizebits, size); + end_block = init_page_buffers(page, bdev, block, size); spin_unlock(&inode->i_mapping->private_lock); done: ret = (block < end_block) ? 1 : -ENXIO; | |