fix some conversion overflows
Subsystems (3)
PATCH 1/1 fix some conversion overflows
Fix page index to offset conversion overflows in buffer layer, ecryptfs, and ocfs2.
It would be nice to convert the whole tree to page_offset, but for now just fix the bugs.
Signed-off-by Nick Piggin <[email protected]>
---
fs/buffer.c +1 -1
@@ -2221,7 +2221,7 @@ block_page_mkwrite(struct vm_area_structlock_page (page); size =i_size_read (inode);if ((page->mapping != inode->i_mapping) || - ((page->index <<PAGE_CACHE_SHIFT ) > size)) { + (page_offset (page) > size)) {/* page got truncated out from underneath us */ goto out_unlock; }
fs/ecryptfs/mmap.c +2 -3
@@ -409,8 +409,7 @@ static int ecryptfs_prepare_write(structif (!PageUptodate (page)) rc =ecryptfs_do_readpage (file, page, page->index);if (page->index !=0 ) { -loff_t end_of_prev_pg_pos = - (((loff_t )page->index <<PAGE_CACHE_SHIFT ) -1 ); +loff_t end_of_prev_pg_pos =page_offset (page) -1 ;if (end_of_prev_pg_pos >i_size_read (page->mapping->host)) { rc = ecryptfs_truncate(file->f_path.dentry,
@@ -736,7 +735,7 @@ static int ecryptfs_commit_write(struct goto out; } inode->i_blocks = lower_inode->i_blocks; - pos = (page->index <<PAGE_CACHE_SHIFT ) + to; + pos =page_offset (page) + to;if (pos >i_size_read (inode)) {i_size_write (inode, pos); ecryptfs_printk(KERN_DEBUG, "Expanded file size to "
fs/ocfs2/mmap.c +1 -1
@@ -89,7 +89,7 @@ static int __ocfs2_page_mkwrite(struct i {int ret;struct address_space *mapping = inode->i_mapping; -loff_t pos = page->index <<PAGE_CACHE_SHIFT ; +loff_t pos =page_offset (page);unsigned int len =PAGE_CACHE_SIZE ;pgoff_t last_index;struct page *locked_page =NULL ;
Quoted 5 lines · Nick Piggin
Fix page index to offset conversion overflows in buffer layer, ecryptfs, and ocfs2.
It would be nice to convert the whole tree to
page_offset, but for now just fix the bugs.
Yup, that's part of the clean-ups in Christoph Lameter's variable order page cache patch set. i.e.:
http://marc.info/?l=linux-kernel&m=118236497117452&w=2
and friends like:
http://marc.info/?l=linux-kernel&m=118236459007960&w=2
http://marc.info/?l=linux-kernel&m=118236495712004&w=2
Cheers,
Dave.
Signature · 3 lines
Dave Chinner Principal Engineer SGI Australian Software Group