From: Dave Hansen <haveblue@us.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, viro@zeniv.linux.org.uk,
hch@infradead.org, Dave Hansen <haveblue@us.ibm.com>
Subject: [PATCH 05/23] elevate write count open()'d files
Date: Wed, 11 Jul 2007 17:17:16 -0700 [thread overview]
Message-ID: <20070712001716.E06724BA@kernel> (raw)
In-Reply-To: <20070712001710.654CD9ED@kernel>
This is the first really tricky patch in the series. It
elevates the writer count on a mount each time a
non-special file is opened for write.
This is not completely apparent in the patch because the
two if() conditions in may_open() above the
mnt_want_write() call are, combined, equivalent to
special_file().
There is also an elevated count around the vfs_create()
call in open_namei(). The count needs to be kept elevated
all the way into the may_open() call. Otherwise, when the
write is dropped, a ro->rw transisition could occur. This
would lead to having rw access on the newly created file,
while the vfsmount is ro. That is bad.
Some filesystems forego the use of normal vfs calls to create
struct files. Make sure that these users elevate the mnt writer
count because they will get __fput(), and we need to make
sure they're balanced.
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---
lxc-dave/fs/file_table.c | 9 ++++++++-
lxc-dave/fs/namei.c | 20 ++++++++++++++++----
lxc-dave/ipc/mqueue.c | 3 +++
3 files changed, 27 insertions(+), 5 deletions(-)
diff -puN fs/file_table.c~tricky-elevate-write-count-files-are-open-ed fs/file_table.c
--- lxc/fs/file_table.c~tricky-elevate-write-count-files-are-open-ed 2007-07-10 12:46:04.000000000 -0700
+++ lxc-dave/fs/file_table.c 2007-07-10 12:46:04.000000000 -0700
@@ -168,6 +168,10 @@ int init_file(struct file *file, struct
file->f_mapping = dentry->d_inode->i_mapping;
file->f_mode = mode;
file->f_op = fop;
+ if (mode & FMODE_WRITE) {
+ error = mnt_want_write(mnt);
+ WARN_ON(error);
+ }
return error;
}
EXPORT_SYMBOL(init_file);
@@ -205,8 +209,11 @@ void fastcall __fput(struct file *file)
if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL))
cdev_put(inode->i_cdev);
fops_put(file->f_op);
- if (file->f_mode & FMODE_WRITE)
+ if (file->f_mode & FMODE_WRITE) {
put_write_access(inode);
+ if (!special_file(inode->i_mode))
+ mnt_drop_write(mnt);
+ }
put_pid(file->f_owner.pid);
file_kill(file);
file->f_path.dentry = NULL;
diff -puN fs/namei.c~tricky-elevate-write-count-files-are-open-ed fs/namei.c
--- lxc/fs/namei.c~tricky-elevate-write-count-files-are-open-ed 2007-07-10 12:46:04.000000000 -0700
+++ lxc-dave/fs/namei.c 2007-07-10 12:46:04.000000000 -0700
@@ -1562,8 +1562,15 @@ int may_open(struct nameidata *nd, int a
return -EACCES;
flag &= ~O_TRUNC;
- } else if (IS_RDONLY(inode) && (flag & FMODE_WRITE))
- return -EROFS;
+ } else if (flag & FMODE_WRITE) {
+ /*
+ * effectively: !special_file()
+ * balanced by __fput()
+ */
+ error = mnt_want_write(nd->mnt);
+ if (error)
+ return error;
+ }
error = vfs_permission(nd, acc_mode);
if (error)
@@ -1706,14 +1713,17 @@ do_last:
}
if (IS_ERR(nd->intent.open.file)) {
- mutex_unlock(&dir->d_inode->i_mutex);
error = PTR_ERR(nd->intent.open.file);
- goto exit_dput;
+ goto exit_mutex_unlock;
}
/* Negative dentry, just create the file */
if (!path.dentry->d_inode) {
+ error = mnt_want_write(nd->mnt);
+ if (error)
+ goto exit_mutex_unlock;
error = open_namei_create(nd, &path, flag, mode);
+ mnt_drop_write(nd->mnt);
if (error)
goto exit;
return 0;
@@ -1751,6 +1761,8 @@ ok:
goto exit;
return 0;
+exit_mutex_unlock:
+ mutex_unlock(&dir->d_inode->i_mutex);
exit_dput:
dput_path(&path, nd);
exit:
diff -puN ipc/mqueue.c~tricky-elevate-write-count-files-are-open-ed ipc/mqueue.c
--- lxc/ipc/mqueue.c~tricky-elevate-write-count-files-are-open-ed 2007-07-10 12:46:04.000000000 -0700
+++ lxc-dave/ipc/mqueue.c 2007-07-10 12:46:04.000000000 -0700
@@ -686,6 +686,9 @@ asmlinkage long sys_mq_open(const char _
goto out;
filp = do_open(dentry, oflag);
} else {
+ error = mnt_want_write(mqueue_mnt);
+ if (error)
+ goto out;
filp = do_create(mqueue_mnt->mnt_root, dentry,
oflag, mode, u_attr);
}
_
next prev parent reply other threads:[~2007-07-12 0:17 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-12 0:17 [PATCH 00/23] Mount writer count API (read-only bind mounts prep) Dave Hansen
2007-07-12 0:17 ` [PATCH 01/23] rearrange may_open() to be r/o friendly Dave Hansen
2007-07-12 0:17 ` [PATCH 02/23] create cleanup helper svc_msnfs() Dave Hansen
2007-07-12 0:17 ` [PATCH 03/23] filesystem helpers for custom 'struct file's Dave Hansen
2007-07-12 0:17 ` [PATCH 04/23] r/o bind mounts: stub functions Dave Hansen
2007-07-12 0:17 ` Dave Hansen [this message]
2007-07-12 0:17 ` [PATCH 06/23] r/o bind mounts: elevate write count for some ioctls Dave Hansen
2007-07-12 0:17 ` [PATCH 07/23] elevate writer count for chown and friends Dave Hansen
2007-07-12 0:17 ` [PATCH 08/23] make access() use mnt check Dave Hansen
2007-07-12 0:17 ` [PATCH 09/23] elevate mnt writers for callers of vfs_mkdir() Dave Hansen
2007-07-12 0:17 ` [PATCH 10/23] elevate write count during entire ncp_ioctl() Dave Hansen
2007-07-12 0:17 ` [PATCH 11/23] elevate write count for link and symlink calls Dave Hansen
2007-07-12 0:17 ` [PATCH 12/23] elevate mount count for extended attributes Dave Hansen
2007-07-12 0:17 ` [PATCH 13/23] elevate write count for file_update_time() Dave Hansen
2007-07-12 0:17 ` [PATCH 14/23] mount_is_safe(): add comment Dave Hansen
2007-07-12 0:17 ` [PATCH 15/23] unix_find_other() elevate write count for touch_atime() Dave Hansen
2007-07-12 0:17 ` [PATCH 16/23] elevate write count over calls to vfs_rename() Dave Hansen
2007-07-12 0:17 ` [PATCH 17/23] nfs: check mnt instead of superblock directly Dave Hansen
2007-07-12 0:17 ` [PATCH 18/23] elevate writer count for do_sys_truncate() Dave Hansen
2007-07-12 0:17 ` [PATCH 19/23] elevate write count for do_utimes() Dave Hansen
2007-07-12 0:17 ` [PATCH 20/23] elevate write count for do_sys_utime() and touch_atime() Dave Hansen
2007-07-12 0:17 ` [PATCH 21/23] sys_mknodat(): elevate write count for vfs_mknod/create() Dave Hansen
2007-07-12 0:17 ` [PATCH 22/23] elevate mnt writers for vfs_unlink() callers Dave Hansen
2007-07-12 0:17 ` [PATCH 23/23] do_rmdir(): elevate write count Dave Hansen
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=20070712001716.E06724BA@kernel \
--to=haveblue@us.ibm.com \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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).