From: Amir Goldstein <amir73il@gmail.com>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: Jan Kara <jack@suse.com>, Al Viro <viro@zeniv.linux.org.uk>,
linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 2/4] vfs: ftruncate check IS_APPEND() on backing inode
Date: Thu, 6 Apr 2017 11:13:47 +0300 [thread overview]
Message-ID: <1491466429-30333-3-git-send-email-amir73il@gmail.com> (raw)
In-Reply-To: <1491466429-30333-1-git-send-email-amir73il@gmail.com>
ftruncate an overlayfs inode was checking IS_APPEND() on
overlay inode, but overlay inode does not have the S_APPEND
flag and IS_APPEND() is always checked on backing inode in
other places.
Set 'inode' var to file_inode() so all checks are performed on
backing inode and use locks_inode() explicitly for calling
locks_verify_truncate().
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
fs/open.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/fs/open.c b/fs/open.c
index 53b1b33..0e3c12b 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -165,7 +165,6 @@ COMPAT_SYSCALL_DEFINE2(truncate, const char __user *, path, compat_off_t, length
static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
{
struct inode *inode;
- struct dentry *dentry;
struct fd f;
int error;
@@ -181,8 +180,7 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
if (f.file->f_flags & O_LARGEFILE)
small = 0;
- dentry = f.file->f_path.dentry;
- inode = dentry->d_inode;
+ inode = file_inode(f.file);
error = -EINVAL;
if (!S_ISREG(inode->i_mode) || !(f.file->f_mode & FMODE_WRITE))
goto out_putf;
@@ -197,11 +195,12 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
goto out_putf;
file_start_write(f.file);
- error = locks_verify_truncate(inode, f.file, length);
+ error = locks_verify_truncate(locks_inode(f.file), f.file, length);
if (!error)
error = security_path_truncate(&f.file->f_path);
if (!error)
- error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
+ error = do_truncate(f.file->f_path.dentry, length,
+ ATTR_MTIME|ATTR_CTIME, f.file);
file_end_write(f.file);
out_putf:
fdput(f);
--
2.7.4
next prev parent reply other threads:[~2017-04-06 8:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-06 8:13 [PATCH 0/4] ovl: fix IS_APPEND() checks Amir Goldstein
2017-04-06 8:13 ` [PATCH 1/4] vfs: ftruncate freeze protect backing inode Amir Goldstein
2017-04-06 15:42 ` Amir Goldstein
2017-04-06 8:13 ` Amir Goldstein [this message]
2017-04-06 8:13 ` [PATCH 3/4] vfs: truncate check IS_APPEND() on " Amir Goldstein
2017-04-06 8:13 ` [PATCH 4/4] vfs: open " Amir Goldstein
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=1491466429-30333-3-git-send-email-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=jack@suse.com \
--cc=linux-fsdevel@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;
as well as URLs for NNTP newsgroup(s).