iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

f2fs: should convert inline_data during the mkwrite

Browse Source 
If mkwrite is called to an inode having inline_data, it can overwrite the data
index space as NEW_ADDR. (e.g., the first 4 bytes are coincidently zero)

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Jaegeuk Kim 2014-08-07 16:32:25 -07:00
parent e1c4204520
commit b067ba1f1b
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/f2fs/data.c
View File

@ -946,7 +946,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,
f2fs_balance_fs(sbi); f2fs_balance_fs(sbi);
repeat: repeat:
err = f2fs_convert_inline_data(inode, pos + len); err = f2fs_convert_inline_data(inode, pos + len, NULL);
if (err) if (err)
goto fail; goto fail;

2
fs/f2fs/f2fs.h
View File

@ -1439,7 +1439,7 @@ extern const struct inode_operations f2fs_special_inode_operations;
*/ */
bool f2fs_may_inline(struct inode *); bool f2fs_may_inline(struct inode *);
int f2fs_read_inline_data(struct inode *, struct page *); int f2fs_read_inline_data(struct inode *, struct page *);
int f2fs_convert_inline_data(struct inode *, pgoff_t); int f2fs_convert_inline_data(struct inode *, pgoff_t, struct page *);
int f2fs_write_inline_data(struct inode *, struct page *, unsigned int); int f2fs_write_inline_data(struct inode *, struct page *, unsigned int);
void truncate_inline_data(struct inode *, u64); void truncate_inline_data(struct inode *, u64);
int recover_inline_data(struct inode *, struct page *); int recover_inline_data(struct inode *, struct page *);

11
fs/f2fs/file.c
View File

@ -41,6 +41,11 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma,
sb_start_pagefault(inode->i_sb); sb_start_pagefault(inode->i_sb);
/* force to convert with normal data indices */
err = f2fs_convert_inline_data(inode, MAX_INLINE_DATA + 1, page);
if (err)
goto out;
/* block allocation */ /* block allocation */
f2fs_lock_op(sbi); f2fs_lock_op(sbi);
set_new_dnode(&dn, inode, NULL, NULL, 0); set_new_dnode(&dn, inode, NULL, NULL, 0);
@ -533,7 +538,7 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
if ((attr->ia_valid & ATTR_SIZE) && if ((attr->ia_valid & ATTR_SIZE) &&
attr->ia_size != i_size_read(inode)) { attr->ia_size != i_size_read(inode)) {
err = f2fs_convert_inline_data(inode, attr->ia_size); err = f2fs_convert_inline_data(inode, attr->ia_size, NULL);
if (err) if (err)
return err; return err;
@ -622,7 +627,7 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)
loff_t off_start, off_end; loff_t off_start, off_end;
int ret = 0; int ret = 0;
ret = f2fs_convert_inline_data(inode, MAX_INLINE_DATA + 1); ret = f2fs_convert_inline_data(inode, MAX_INLINE_DATA + 1, NULL);
if (ret) if (ret)
return ret; return ret;
@ -678,7 +683,7 @@ static int expand_inode_data(struct inode *inode, loff_t offset,
if (ret) if (ret)
return ret; return ret;
ret = f2fs_convert_inline_data(inode, offset + len); ret = f2fs_convert_inline_data(inode, offset + len, NULL);
if (ret) if (ret)
return ret; return ret;

16
fs/f2fs/inline.c
View File

@ -124,9 +124,10 @@ out:
return err; return err;
} }
int f2fs_convert_inline_data(struct inode *inode, pgoff_t to_size) int f2fs_convert_inline_data(struct inode *inode, pgoff_t to_size,
struct page *page)
{ {
struct page *page; struct page *new_page = page;
int err; int err;
if (!f2fs_has_inline_data(inode)) if (!f2fs_has_inline_data(inode))
@ -134,12 +135,15 @@ int f2fs_convert_inline_data(struct inode *inode, pgoff_t to_size)
else if (to_size <= MAX_INLINE_DATA) else if (to_size <= MAX_INLINE_DATA)
return 0; return 0;
page = grab_cache_page(inode->i_mapping, 0); if (!page || page->index != 0) {
if (!page) new_page = grab_cache_page(inode->i_mapping, 0);
if (!new_page)
return -ENOMEM; return -ENOMEM;
}
err = __f2fs_convert_inline_data(inode, page); err = __f2fs_convert_inline_data(inode, new_page);
f2fs_put_page(page, 1); if (!page || page->index != 0)
f2fs_put_page(new_page, 1);
return err; return err;
} }