History

vfs: fix O_DIRECT read past end of block device

The direct-IO write path already had the i_size checks in mm/filemap.c, but it turns out the read path did not, and removing the block size checks in fs/block_dev.c (commit bbec0270bdd8: "blkdev_max_block: make private to fs/buffer.c") removed the magic "shrink IO to past the end of the device" code there. Fix it by truncating the IO to the size of the block device, like the write path already does. NOTE! I suspect the write path would be *much* better off doing it this way in fs/block_dev.c, rather than hidden deep in mm/filemap.c. The mm/filemap.c code is extremely hard to follow, and has various conditionals on the target being a block device (ie the flag passed in to 'generic_write_checks()', along with a conditional update of the inode timestamp etc). It is also quite possible that we should treat this whole block device size as a "s_maxbytes" issue, and try to make the logic even more generic. However, in the meantime this is the fairly minimal targeted fix. Noted by Milan Broz thanks to a regression test for the cryptsetup reencrypt tool.

Linus Torvalds committed 13 years ago

Commit 684c9aa1 parent 1b3c3931 file · +17 −1Browse files

Unified · Split

fs/block_dev.c+17−1
@@ -1544,6 +1544,22 @@ ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov, · 1543 unmodified lines
1544}1544}
1545EXPORT_SYMBOL_GPL(blkdev_aio_write);1545EXPORT_SYMBOL_GPL(blkdev_aio_write);
1546 1546
1547static ssize_t blkdev_aio_read(struct kiocb *iocb, const struct iovec *iov,
1548 unsigned long nr_segs, loff_t pos)
1549{
1550 struct file *file = iocb->ki_filp;
1551 struct inode *bd_inode = file->f_mapping->host;
1552 loff_t size = i_size_read(bd_inode);
1553
1554 if (pos >= size)
1555 return 0;
1556
1557 size -= pos;
1558 if (size < INT_MAX)
1559 nr_segs = iov_shorten((struct iovec *)iov, nr_segs, size);
1560 return generic_file_aio_read(iocb, iov, nr_segs, pos);
1561}
1562
1547/*1563/*
1548 * Try to release a page associated with block device when the system1564 * Try to release a page associated with block device when the system
1549 * is under memory pressure.1565 * is under memory pressure.
@@ -1574,7 +1590,7 @@ const struct file_operations def_blk_fops = { · 24 unmodified lines
1574 .llseek = block_llseek,1590 .llseek = block_llseek,
1575 .read = do_sync_read,1591 .read = do_sync_read,
1576 .write = do_sync_write,1592 .write = do_sync_write,
1577 .aio_read = generic_file_aio_read,1593 .aio_read = blkdev_aio_read,
1578 .aio_write = blkdev_aio_write,1594 .aio_write = blkdev_aio_write,
1579 .mmap = generic_file_mmap,1595 .mmap = generic_file_mmap,
1580 .fsync = blkdev_fsync,1596 .fsync = blkdev_fsync,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t