Home » Mailing list archives » linux-kernel » 2007 » September » 17

[PATCH 02/24] rearrange may_open() to be r/o friendly

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Dave Hansen
Subject: [PATCH 02/24] rearrange may_open() to be r/o friendly
Date: Monday, September 17, 2007 - 11:27 am

may_open() calls vfs_permission() before it does checks for
IS_RDONLY(inode).  It checks _again_ inside of vfs_permission().

The check inside of vfs_permission() is going away eventually.
With the mnt_want/drop_write() functions, all of the r/o
checks (except for this one) are consistently done before
calling permission().  Because of this, I'd like to use
permission() to hold a debugging check to make sure that
the mnt_want/drop_write() calls are actually being made.

So, to do this:
1. remove the IS_RDONLY() check from permission()
2. enforce that you must mnt_want_write() before
   even calling permission()
3. enable a debugging in permission()

We need to rearrange may_open().  Here's the patch.

Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---

 lxc-dave/fs/namei.c |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff -puN fs/namei.c~rearrange-permission-and-ro-checks-in-may_open fs/namei.c
--- lxc/fs/namei.c~rearrange-permission-and-ro-checks-in-may_open	2007-09-17 09:43:56.000000000 -0700
+++ lxc-dave/fs/namei.c	2007-09-17 09:43:56.000000000 -0700
@@ -228,6 +228,10 @@ int generic_permission(struct inode *ino
 int permission(struct inode *inode, int mask, struct nameidata *nd)
 {
 	int retval, submask;
+	struct vfsmount *mnt = NULL;
+
+	if (nd)
+		mnt = nd->mnt;
 
 	if (mask & MAY_WRITE) {
 		umode_t mode = inode->i_mode;
@@ -251,7 +255,7 @@ int permission(struct inode *inode, int 
 		 * MAY_EXEC on regular files is denied if the fs is mounted
 		 * with the "noexec" flag.
 		 */
-		if (nd && nd->mnt && (nd->mnt->mnt_flags & MNT_NOEXEC))
+		if (mnt && (mnt->mnt_flags & MNT_NOEXEC))
 			return -EACCES;
 	}
 
@@ -1604,10 +1608,6 @@ int may_open(struct nameidata *nd, int a
 	if (S_ISDIR(inode->i_mode) && (flag & FMODE_WRITE))
 		return -EISDIR;
 
-	error = vfs_permission(nd, acc_mode);
-	if (error)
-		return error;
-
 	/*
 	 * FIFO's, sockets and device files are special: they don't
 	 * actually live on the filesystem itself, and as such you
@@ -1622,6 +1622,10 @@ int may_open(struct nameidata *nd, int a
 		flag &= ~O_TRUNC;
 	} else if (IS_RDONLY(inode) && (flag & FMODE_WRITE))
 		return -EROFS;
+
+	error = vfs_permission(nd, acc_mode);
+	if (error)
+		return error;
 	/*
 	 * An append-only file must be opened in append mode for writing.
 	 */
_
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 01/24] filesystem helpers for custom 'struct file's, Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 00/24] Read-only bind mounts, Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 02/24] rearrange may_open() to be r/o friendly, Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 03/24] create cleanup helper svc_msnfs(), Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 04/24] r/o bind mounts: stub functions, Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 05/24] elevate write count open()'d files, Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 06/24] r/o bind mounts: elevate write count for som ..., Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 07/24] elevate writer count for chown and friends, Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 08/24] make access() use mnt check, Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 09/24] elevate mnt writers for callers of vfs_mkdir(), Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 10/24] elevate write count during entire ncp_ioctl(), Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 11/24] elevate write count for link and symlink calls, Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 12/24] elevate mount count for extended attributes, Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 13/24] elevate write count for file_update_time(), Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 14/24] unix_find_other() elevate write count for to ..., Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 15/24] elevate write count over calls to vfs_rename(), Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 16/24] nfs: check mnt instead of superblock directly, Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 17/24] elevate writer count for do_sys_truncate(), Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 18/24] elevate write count for do_utimes(), Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 19/24] elevate write count for do_sys_utime() and t ..., Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 20/24] sys_mknodat(): elevate write count for vfs_m ..., Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 21/24] elevate mnt writers for vfs_unlink() callers, Dave Hansen, (Mon Sep 17, 11:27 am)
[PATCH 22/24] do_rmdir(): elevate write count, Dave Hansen, (Mon Sep 17, 11:27 am)
Re: [PATCH 00/24] Read-only bind mounts, Serge E. Hallyn, (Wed Sep 19, 7:21 am)
Re: [PATCH 01/24] filesystem helpers for custom 'struct file's, Christoph Hellwig, (Wed Sep 19, 10:26 am)
Re: [PATCH 02/24] rearrange may_open() to be r/o friendly, Christoph Hellwig, (Wed Sep 19, 10:27 am)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Christoph Hellwig, (Wed Sep 19, 10:28 am)
Re: [PATCH 04/24] r/o bind mounts: stub functions, Christoph Hellwig, (Wed Sep 19, 10:28 am)
Re: [PATCH 05/24] elevate write count open()'d files, Christoph Hellwig, (Wed Sep 19, 10:30 am)
Re: [PATCH 06/24] r/o bind mounts: elevate write count for ..., Christoph Hellwig, (Wed Sep 19, 10:31 am)
Re: [PATCH 07/24] elevate writer count for chown and friends, Christoph Hellwig, (Wed Sep 19, 10:31 am)
Re: [PATCH 08/24] make access() use mnt check, Christoph Hellwig, (Wed Sep 19, 10:32 am)
Re: [PATCH 09/24] elevate mnt writers for callers of vfs_m ..., Christoph Hellwig, (Wed Sep 19, 10:32 am)
Re: [PATCH 10/24] elevate write count during entire ncp_io ..., Christoph Hellwig, (Wed Sep 19, 10:33 am)
Re: [PATCH 11/24] elevate write count for link and symlink ..., Christoph Hellwig, (Wed Sep 19, 10:33 am)
Re: [PATCH 12/24] elevate mount count for extended attributes, Christoph Hellwig, (Wed Sep 19, 10:34 am)
Re: [PATCH 13/24] elevate write count for file_update_time(), Christoph Hellwig, (Wed Sep 19, 10:35 am)
Re: [PATCH 14/24] unix_find_other() elevate write count fo ..., Christoph Hellwig, (Wed Sep 19, 10:35 am)
Re: [PATCH 15/24] elevate write count over calls to vfs_re ..., Christoph Hellwig, (Wed Sep 19, 10:35 am)
Re: [PATCH 16/24] nfs: check mnt instead of superblock dir ..., Christoph Hellwig, (Wed Sep 19, 10:36 am)
Re: [PATCH 17/24] elevate writer count for do_sys_truncate(), Christoph Hellwig, (Wed Sep 19, 10:36 am)
Re: [PATCH 18/24] elevate write count for do_utimes(), Christoph Hellwig, (Wed Sep 19, 10:36 am)
Re: [PATCH 19/24] elevate write count for do_sys_utime() a ..., Christoph Hellwig, (Wed Sep 19, 10:36 am)
Re: [PATCH 20/24] sys_mknodat(): elevate write count for v ..., Christoph Hellwig, (Wed Sep 19, 10:38 am)
Re: [PATCH 21/24] elevate mnt writers for vfs_unlink() callers, Christoph Hellwig, (Wed Sep 19, 10:38 am)
Re: [PATCH 22/24] do_rmdir(): elevate write count, Christoph Hellwig, (Wed Sep 19, 10:39 am)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Jan Engelhardt, (Wed Sep 19, 10:39 am)
Re: [PATCH 00/24] Read-only bind mounts, Christoph Hellwig, (Wed Sep 19, 10:44 am)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Dave Hansen, (Wed Sep 19, 10:45 am)
[PATCH] docuement filesystem helpers for custom 'struct file's, Dave Hansen, (Wed Sep 19, 10:47 am)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Trond Myklebust, (Wed Sep 19, 10:54 am)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Christoph Hellwig, (Wed Sep 19, 10:59 am)
Re: [PATCH 03/24] create cleanup helper svc_msnfs(), Trond Myklebust, (Wed Sep 19, 11:10 am)
Re: [PATCH 00/24] Read-only bind mounts, Andrew Morton, (Wed Sep 19, 2:24 pm)
Re: [PATCH 00/24] Read-only bind mounts, Dave Hansen, (Wed Sep 19, 2:56 pm)
Re: [PATCH 00/24] Read-only bind mounts, Andrew Morton, (Wed Sep 19, 3:06 pm)
Re: [PATCH] docuement filesystem helpers for custom 'struc ..., Randy Dunlap, (Wed Sep 19, 3:07 pm)
Re: [PATCH 00/24] Read-only bind mounts, Miklos Szeredi, (Thu Sep 20, 2:58 am)
Re: [PATCH] docuement filesystem helpers for custom 'struc ..., Dave Hansen, (Thu Sep 20, 10:25 am)
Re: [PATCH] docuement filesystem helpers for custom 'struc ..., Christoph Hellwig, (Thu Sep 20, 10:30 am)
Re: [PATCH 02/24] rearrange may_open() to be r/o friendly, Dave Hansen, (Thu Sep 20, 11:47 am)