linux-kernel - [PATCH] overlayfs: Pass O_LARGEFILE unconditionally in ovl_copy_up

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150928141806.21007.8412.stgit@warthog.procyon.org.uk>
Date:	Mon, 28 Sep 2015 15:18:06 +0100
From:	David Howells <dhowells@...hat.com>
To:	miklos@...redi.hu
Cc:	dhowells@...hat.com, linux-kernel@...r.kernel.org,
	linux-unionfs@...r.kernel.org, viro@...IV.linux.org.uk
Subject: [PATCH] overlayfs: Pass O_LARGEFILE unconditionally in
 ovl_copy_up_data()

Pass O_LARGEFILE unconditionally in ovl_copy_up_data() as it's purely for
catching 32-bit userspace dealing with a file large enough that it'll be
mishandled if the application isn't aware that there might be an integer
overflow.  Inside the kernel, there shouldn't be any problems.

Reported-by: Ulrich Obergfell <uobergfe@...hat.com>
Signed-off-by: David Howells <dhowells@...hat.com>
---

 fs/overlayfs/copy_up.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index d3a5990fd2b9..871fcb67be97 100644
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -76,19 +76,16 @@ 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, o_flag = 0;
+	int error = 0;
 
 	if (len == 0)
 		return 0;
 
-	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);
+	old_file = ovl_path_open(old, O_LARGEFILE | O_RDONLY);
 	if (IS_ERR(old_file))
 		return PTR_ERR(old_file);
 
-	new_file = ovl_path_open(new, o_flag | O_WRONLY);
+	new_file = ovl_path_open(new, O_LARGEFILE | O_WRONLY);
 	if (IS_ERR(new_file)) {
 		error = PTR_ERR(new_file);
 		goto out_fput;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/