From: David Howells <dhowells@redhat.com>
To: miklos@szeredi.hu
Cc: dhowells@redhat.com, linux-kernel@vger.kernel.org,
linux-unionfs@vger.kernel.org, viro@ZenIV.linux.org.uk
Subject: [PATCH 1/2] overlayfs: Conditionally use O_LARGEFILE in ovl_copy_up()
Date: Fri, 18 Sep 2015 11:45:12 +0100 [thread overview]
Message-ID: <20150918104512.7696.55992.stgit@warthog.procyon.org.uk> (raw)
Open the lower file with O_LARGEFILE in ovl_copy_up() if the lower file is
>= 4GiB in size.
Reported-by: Ulrich Obergfell <uobergfe@redhat.com>
Signed-off-by: David Howells <dhowells@redhat.com>
---
fs/overlayfs/copy_up.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index 84d693d37428..89b4cb3773d7 100644
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -76,16 +76,19 @@ static int ovl_copy_up_data(struct path *old, struct path *new, loff_t len)
struct file *new_file;
loff_t old_pos = 0;
loff_t new_pos = 0;
- int error = 0;
+ int error = 0, o_flag = 0;
if (len == 0)
return 0;
- old_file = ovl_path_open(old, O_RDONLY);
+ if (i_size_read(d_inode(old->dentry)) > MAX_NON_LFS)
+ o_flag |= O_LARGEFILE;
+
+ old_file = ovl_path_open(old, o_flag | O_RDONLY);
if (IS_ERR(old_file))
return PTR_ERR(old_file);
- new_file = ovl_path_open(new, O_WRONLY);
+ new_file = ovl_path_open(new, o_flag | O_WRONLY);
if (IS_ERR(new_file)) {
error = PTR_ERR(new_file);
goto out_fput;
next reply other threads:[~2015-09-18 10:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-18 10:45 David Howells [this message]
2015-09-18 10:45 ` [PATCH 2/2] overlayfs: Fix dentry reference leak David Howells
2015-09-21 8:19 ` Miklos Szeredi
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=20150918104512.7696.55992.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=viro@ZenIV.linux.org.uk \
/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