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

f2fs: avoid memory allocation failure due to a long length

Browse Source 
We need to avoid ENOMEM due to unexpected long length.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Jaegeuk Kim 2016-07-16 21:59:22 -07:00
parent dcf25fe8fc
commit 363cad7f7e
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/f2fs/file.c
View File

@ -1000,33 +1000,43 @@ static int __clone_blkaddrs(struct inode *src_inode, struct inode *dst_inode,
static int __exchange_data_block(struct inode *src_inode, static int __exchange_data_block(struct inode *src_inode,
struct inode *dst_inode, pgoff_t src, pgoff_t dst, struct inode *dst_inode, pgoff_t src, pgoff_t dst,
int len, bool full) pgoff_t len, bool full)
{ {
block_t *src_blkaddr; block_t *src_blkaddr;
int *do_replace; int *do_replace;
pgoff_t olen;
int ret; int ret;
src_blkaddr = f2fs_kvzalloc(sizeof(block_t) * len, GFP_KERNEL); while (len) {
olen = min((pgoff_t)4 * ADDRS_PER_BLOCK, len);
src_blkaddr = f2fs_kvzalloc(sizeof(block_t) * olen, GFP_KERNEL);
if (!src_blkaddr) if (!src_blkaddr)
return -ENOMEM; return -ENOMEM;
do_replace = f2fs_kvzalloc(sizeof(int) * len, GFP_KERNEL); do_replace = f2fs_kvzalloc(sizeof(int) * olen, GFP_KERNEL);
if (!do_replace) { if (!do_replace) {
kvfree(src_blkaddr); kvfree(src_blkaddr);
return -ENOMEM; return -ENOMEM;
} }
ret = __read_out_blkaddrs(src_inode, src_blkaddr, do_replace, src, len); ret = __read_out_blkaddrs(src_inode, src_blkaddr,
do_replace, src, olen);
if (ret) if (ret)
goto roll_back; goto roll_back;
ret = __clone_blkaddrs(src_inode, dst_inode, src_blkaddr, ret = __clone_blkaddrs(src_inode, dst_inode, src_blkaddr,
do_replace, src, dst, len, full); do_replace, src, dst, olen, full);
if (ret) if (ret)
goto roll_back; goto roll_back;
src += olen;
dst += olen;
len -= olen;
kvfree(src_blkaddr); kvfree(src_blkaddr);
kvfree(do_replace); kvfree(do_replace);
}
return 0; return 0;
roll_back: roll_back: