LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Dave Hansen <haveblue@us.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: hch@lst.de, miklos@szeredi.hu, akpm@osdl.org,
	Dave Hansen <haveblue@us.ibm.com>
Subject: [PATCH 22/30] r/o bind mounts: elevate write count for chmod/chown callers
Date: Fri, 15 Feb 2008 14:37:50 -0800	[thread overview]
Message-ID: <20080215223750.6E962669@kernel> (raw)
In-Reply-To: <20080215223721.9E0A088A@kernel>


chown/chmod,etc...  don't call permission in the same way that the normal
"open for write" calls do.  They still write to the filesystem, so bump the
write count during these operations.

Acked-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 linux-2.6.git-dave/fs/open.c |   39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff -puN fs/open.c~r-o-bind-mounts-elevate-writer-count-for-chown-and-friends fs/open.c
--- linux-2.6.git/fs/open.c~r-o-bind-mounts-elevate-writer-count-for-chown-and-friends	2008-02-15 13:25:55.000000000 -0800
+++ linux-2.6.git-dave/fs/open.c	2008-02-15 13:25:55.000000000 -0800
@@ -567,12 +567,12 @@ asmlinkage long sys_fchmod(unsigned int 
 
 	audit_inode(NULL, dentry);
 
-	err = -EROFS;
-	if (IS_RDONLY(inode))
+	err = mnt_want_write(file->f_vfsmnt);
+	if (err)
 		goto out_putf;
 	err = -EPERM;
 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
-		goto out_putf;
+		goto out_drop_write;
 	mutex_lock(&inode->i_mutex);
 	if (mode == (mode_t) -1)
 		mode = inode->i_mode;
@@ -581,6 +581,8 @@ asmlinkage long sys_fchmod(unsigned int 
 	err = notify_change(dentry, &newattrs);
 	mutex_unlock(&inode->i_mutex);
 
+out_drop_write:
+	mnt_drop_write(file->f_vfsmnt);
 out_putf:
 	fput(file);
 out:
@@ -600,13 +602,13 @@ asmlinkage long sys_fchmodat(int dfd, co
 		goto out;
 	inode = nd.path.dentry->d_inode;
 
-	error = -EROFS;
-	if (IS_RDONLY(inode))
+	error = mnt_want_write(nd.path.mnt);
+	if (error)
 		goto dput_and_out;
 
 	error = -EPERM;
 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
-		goto dput_and_out;
+		goto out_drop_write;
 
 	mutex_lock(&inode->i_mutex);
 	if (mode == (mode_t) -1)
@@ -616,6 +618,8 @@ asmlinkage long sys_fchmodat(int dfd, co
 	error = notify_change(nd.path.dentry, &newattrs);
 	mutex_unlock(&inode->i_mutex);
 
+out_drop_write:
+	mnt_drop_write(nd.path.mnt);
 dput_and_out:
 	path_put(&nd.path);
 out:
@@ -638,9 +642,6 @@ static int chown_common(struct dentry * 
 		printk(KERN_ERR "chown_common: NULL inode\n");
 		goto out;
 	}
-	error = -EROFS;
-	if (IS_RDONLY(inode))
-		goto out;
 	error = -EPERM;
 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
 		goto out;
@@ -671,7 +672,12 @@ asmlinkage long sys_chown(const char __u
 	error = user_path_walk(filename, &nd);
 	if (error)
 		goto out;
+	error = mnt_want_write(nd.path.mnt);
+	if (error)
+		goto out_release;
 	error = chown_common(nd.path.dentry, user, group);
+	mnt_drop_write(nd.path.mnt);
+out_release:
 	path_put(&nd.path);
 out:
 	return error;
@@ -691,7 +697,12 @@ asmlinkage long sys_fchownat(int dfd, co
 	error = __user_walk_fd(dfd, filename, follow, &nd);
 	if (error)
 		goto out;
+	error = mnt_want_write(nd.path.mnt);
+	if (error)
+		goto out_release;
 	error = chown_common(nd.path.dentry, user, group);
+	mnt_drop_write(nd.path.mnt);
+out_release:
 	path_put(&nd.path);
 out:
 	return error;
@@ -705,7 +716,12 @@ asmlinkage long sys_lchown(const char __
 	error = user_path_walk_link(filename, &nd);
 	if (error)
 		goto out;
+	error = mnt_want_write(nd.path.mnt);
+	if (error)
+		goto out_release;
 	error = chown_common(nd.path.dentry, user, group);
+	mnt_drop_write(nd.path.mnt);
+out_release:
 	path_put(&nd.path);
 out:
 	return error;
@@ -722,9 +738,14 @@ asmlinkage long sys_fchown(unsigned int 
 	if (!file)
 		goto out;
 
+	error = mnt_want_write(file->f_vfsmnt);
+	if (error)
+		goto out_fput;
 	dentry = file->f_path.dentry;
 	audit_inode(NULL, dentry);
 	error = chown_common(dentry, user, group);
+	mnt_drop_write(file->f_vfsmnt);
+out_fput:
 	fput(file);
 out:
 	return error;
_

  parent reply	other threads:[~2008-02-15 22:51 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-15 22:37 [PATCH 00/30] Read-only bind mounts (-mm resend) Dave Hansen
2008-02-15 22:37 ` [PATCH 01/30] reiserfs: eliminate private use of struct file in xattr Dave Hansen
2008-02-15 22:37 ` [PATCH 02/30] hppfs pass vfsmount to dentry_open() Dave Hansen
2008-02-15 22:37 ` [PATCH 03/30] check for null vfsmount in dentry_open() Dave Hansen
2008-02-15 22:37 ` [PATCH 04/30] fix up new filp allocators Dave Hansen
2008-02-15 22:37 ` [PATCH 05/30] do namei_flags calculation inside open_namei() Dave Hansen
2008-02-15 22:37 ` [PATCH 06/30] merge open_namei() and do_filp_open() Dave Hansen
2008-02-15 22:37 ` [PATCH 07/30] r/o bind mounts: stub functions Dave Hansen
2008-02-16  0:32   ` Theodore Tso
2008-02-16  0:49     ` Dave Hansen
2008-02-16  1:00       ` Theodore Tso
2008-02-16  1:11         ` Andrew Morton
2008-02-16  6:31           ` Christoph Hellwig
2008-02-16  6:46             ` Andrew Morton
2008-02-18  7:06               ` Dave Hansen
2008-02-20 22:25             ` Dave Hansen
2008-02-20 22:58               ` Christoph Hellwig
2008-02-15 22:37 ` [PATCH 08/30] r/o bind mounts: create helper to drop file write access Dave Hansen
2008-02-15 22:37 ` [PATCH 09/30] r/o bind mounts: drop write during emergency remount Dave Hansen
2008-02-18 16:29   ` Miklos Szeredi
2008-02-23 13:38     ` Al Viro
2008-02-15 22:37 ` [PATCH 10/30] r/o bind mounts: elevate write count for vfs_rmdir() Dave Hansen
2008-02-15 22:37 ` [PATCH 11/30] r/o bind mounts: elevate write count for callers of vfs_mkdir() Dave Hansen
2008-02-15 22:37 ` [PATCH 12/30] r/o bind mounts: elevate mnt_writers for unlink callers Dave Hansen
2008-02-15 22:37 ` [PATCH 13/30] r/o bind mounts: elevate write count for xattr_permission() callers Dave Hansen
2008-02-15 22:37 ` [PATCH 14/30] r/o bind mounts: elevate write count for ncp_ioctl() Dave Hansen
2008-02-15 22:37 ` [PATCH 15/30] r/o bind mounts: write counts for time functions Dave Hansen
2008-02-15 22:37 ` [PATCH 16/30] r/o bind mounts: elevate write count for do_utimes() Dave Hansen
2008-02-15 22:37 ` [PATCH 17/30] r/o bind mounts: write count for file_update_time() Dave Hansen
2008-02-15 22:37 ` [PATCH 18/30] r/o bind mounts: write counts for link/symlink Dave Hansen
2008-02-15 22:37 ` [PATCH 19/30] r/o bind mounts: elevate write count for ioctls() Dave Hansen
2008-02-15 22:37 ` [PATCH 20/30] r/o bind mounts: elevate write count for open()s Dave Hansen
2008-02-15 22:37 ` [PATCH 21/30] r/o bind mounts: get write access for vfs_rename() callers Dave Hansen
2008-02-15 22:37 ` Dave Hansen [this message]
2008-02-15 22:37 ` [PATCH 23/30] r/o bind mounts: write counts for truncate() Dave Hansen
2008-02-15 22:37 ` [PATCH 24/30] r/o bind mounts: elevate count for xfs timestamp updates Dave Hansen
2008-02-15 22:37 ` [PATCH 25/30] r/o bind mounts: make access() use new r/o helper Dave Hansen
2008-02-15 22:37 ` [PATCH 26/30] r/o bind mounts: check mnt instead of superblock directly Dave Hansen
2008-02-15 22:37 ` [PATCH 27/30] r/o bind mounts: get callers of vfs_mknod/create() Dave Hansen
2008-02-15 22:37 ` [PATCH 28/30] r/o bind mounts: track numbers of writers to mounts Dave Hansen
2008-02-18 16:10   ` Miklos Szeredi
2008-02-20 21:12     ` Dave Hansen
2008-02-15 22:38 ` [PATCH 29/30] r/o bind mounts: honor mount writer counts at remount Dave Hansen
2008-02-15 22:38 ` [PATCH 30/30] r/o bind mounts: debugging for missed calls Dave Hansen
2008-02-16  1:32 ` [PATCH] r/o bind mounts: stub functions 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=20080215223750.6E962669@kernel \
    --to=haveblue@us.ibm.com \
    --cc=akpm@osdl.org \
    --cc=hch@lst.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=miklos@szeredi.hu \
    --subject='Re: [PATCH 22/30] r/o bind mounts: elevate write count for chmod/chown callers' \
    /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

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).