Commit b41572e9 authored by Dave Hansen's avatar Dave Hansen Committed by Linus Torvalds

r/o bind mounts: rearrange may_open() to be r/o friendly

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. actually add the debugging check to permission()

We need to rearrange may_open() to do r/o checks before calling permission().
Here's the patch.
Signed-off-by: default avatarDave Hansen <haveblue@us.ibm.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ce8d2cdf
...@@ -1604,10 +1604,6 @@ int may_open(struct nameidata *nd, int acc_mode, int flag) ...@@ -1604,10 +1604,6 @@ int may_open(struct nameidata *nd, int acc_mode, int flag)
if (S_ISDIR(inode->i_mode) && (flag & FMODE_WRITE)) if (S_ISDIR(inode->i_mode) && (flag & FMODE_WRITE))
return -EISDIR; return -EISDIR;
error = vfs_permission(nd, acc_mode);
if (error)
return error;
/* /*
* FIFO's, sockets and device files are special: they don't * FIFO's, sockets and device files are special: they don't
* actually live on the filesystem itself, and as such you * actually live on the filesystem itself, and as such you
...@@ -1622,6 +1618,10 @@ int may_open(struct nameidata *nd, int acc_mode, int flag) ...@@ -1622,6 +1618,10 @@ int may_open(struct nameidata *nd, int acc_mode, int flag)
flag &= ~O_TRUNC; flag &= ~O_TRUNC;
} else if (IS_RDONLY(inode) && (flag & FMODE_WRITE)) } else if (IS_RDONLY(inode) && (flag & FMODE_WRITE))
return -EROFS; return -EROFS;
error = vfs_permission(nd, acc_mode);
if (error)
return error;
/* /*
* An append-only file must be opened in append mode for writing. * An append-only file must be opened in append mode for writing.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment