[linux-cifs-client] [PATCH 4/5] [CIFS] when creating new inodes, use file_mode/dir_mode exclusively on mount without unix extensions

Jeff Layton jlayton at redhat.com
Mon May 12 14:49:53 GMT 2008

When CIFS creates a new inode on a mount without unix extensions, it
temporarily assigns the mode that was passed to it in the create/mkdir
call. Eventually, when the inode is revalidated, it changes to have the
file_mode or dir_mode for the mount. This is confusing to users who
expect that the mode shouldn't change this way. It's also problematic
since only the mode is treated this way, not the uid or gid. Suppose you
have a CIFS mount that's mounted with:


...if an unprivileged user comes along and does this on the mount:

mkdir -m 0700 foo
touch foo/bar

...there is a period of time where the touch will fail, since the dir
will initially be owned by root and have mode 0700. If the user waits
long enough, then "foo" will be revalidated and will get the correct
dir_mode permissions.

This patch changes cifs_mkdir and cifs_create to not overwrite the
mode found by the initial cifs_get_inode_info call after the inode is
created on the server. Legacy behavior can be reenabled with the
new "dynperm" mount option.

Signed-off-by: Jeff Layton <jlayton at redhat.com>

 fs/cifs/dir.c   |    4 +++-
 fs/cifs/inode.c |    7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)
-------------- next part --------------
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index e4e0078..597a849 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -242,7 +242,9 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
 						 buf, inode->i_sb, xid,
 			if (newinode) {
-				newinode->i_mode = mode;
+				if (cifs_sb->mnt_cifs_flags &
+					newinode->i_mode = mode;
 				if ((oplock & CIFS_CREATE_ACTION) &&
 				    (cifs_sb->mnt_cifs_flags &
 				     CIFS_MOUNT_SET_UID)) {
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 6c51fc4..2e4f158 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -992,8 +992,11 @@ mkdir_get_info:
 			if (direntry->d_inode) {
-				direntry->d_inode->i_mode = mode;
-				direntry->d_inode->i_mode |= S_IFDIR;
+				if (cifs_sb->mnt_cifs_flags &
+					direntry->d_inode->i_mode =
+						(mode | S_IFDIR);
 				if (cifs_sb->mnt_cifs_flags &
 				     CIFS_MOUNT_SET_UID) {
 					direntry->d_inode->i_uid =

More information about the linux-cifs-client mailing list