From: Jaegeuk Kim <jaegeuk@kernel.org>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Subject: [PATCH 1/3] f2fs: avoid memory allocation failure due to a long length
Date: Sat, 16 Jul 2016 23:24:25 -0700 [thread overview]
Message-ID: <20160717062427.56718-1-jaegeuk@kernel.org> (raw)
We need to avoid ENOMEM due to unexpected long length.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fs/f2fs/file.c | 46 ++++++++++++++++++++++++++++------------------
1 file changed, 28 insertions(+), 18 deletions(-)
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 17b3059..3573b07 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1039,33 +1039,43 @@ static int __clone_blkaddrs(struct inode *src_inode, struct inode *dst_inode,
static int __exchange_data_block(struct inode *src_inode,
struct inode *dst_inode, pgoff_t src, pgoff_t dst,
- int len, bool full)
+ pgoff_t len, bool full)
{
block_t *src_blkaddr;
int *do_replace;
+ pgoff_t olen;
int ret;
- src_blkaddr = f2fs_kvzalloc(sizeof(block_t) * len, GFP_KERNEL);
- if (!src_blkaddr)
- return -ENOMEM;
+ while (len) {
+ olen = min((pgoff_t)4 * ADDRS_PER_BLOCK, len);
- do_replace = f2fs_kvzalloc(sizeof(int) * len, GFP_KERNEL);
- if (!do_replace) {
- kvfree(src_blkaddr);
- return -ENOMEM;
- }
+ src_blkaddr = f2fs_kvzalloc(sizeof(block_t) * olen, GFP_KERNEL);
+ if (!src_blkaddr)
+ return -ENOMEM;
- ret = __read_out_blkaddrs(src_inode, src_blkaddr, do_replace, src, len);
- if (ret)
- goto roll_back;
+ do_replace = f2fs_kvzalloc(sizeof(int) * olen, GFP_KERNEL);
+ if (!do_replace) {
+ kvfree(src_blkaddr);
+ return -ENOMEM;
+ }
- ret = __clone_blkaddrs(src_inode, dst_inode, src_blkaddr,
- do_replace, src, dst, len, full);
- if (ret)
- goto roll_back;
+ ret = __read_out_blkaddrs(src_inode, src_blkaddr,
+ do_replace, src, olen);
+ if (ret)
+ goto roll_back;
- kvfree(src_blkaddr);
- kvfree(do_replace);
+ ret = __clone_blkaddrs(src_inode, dst_inode, src_blkaddr,
+ do_replace, src, dst, olen, full);
+ if (ret)
+ goto roll_back;
+
+ src += olen;
+ dst += olen;
+ len -= olen;
+
+ kvfree(src_blkaddr);
+ kvfree(do_replace);
+ }
return 0;
roll_back:
--
2.8.3
next reply other threads:[~2016-07-17 6:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-17 6:24 Jaegeuk Kim [this message]
2016-07-17 6:24 ` [PATCH 2/3] f2fs: support copy_file_range Jaegeuk Kim
2016-07-18 17:19 ` Jaegeuk Kim
2016-07-17 6:24 ` [PATCH 3/3] f2fs: support clone_file_range Jaegeuk Kim
2016-07-19 3:47 ` Christoph Hellwig
2016-07-19 4:48 ` Jaegeuk Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160717062427.56718-1-jaegeuk@kernel.org \
--to=jaegeuk@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).