Commit 95089910 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

[CIFS] cifs_mkdir and cifs_create should respect the setgid bit on parent dir 



If a server supports unix extensions but does not support POSIX create
routines, then the client will create a new inode with a standard SMB
mkdir or create/open call and then will set the mode. When it does this,
it does not take the setgid bit on the parent directory into account.

This patch has CIFS flip on the setgid bit when the parent directory has
it. If the share is mounted with "setuids" then also change the group
owner to the gid of the parent.

This patch should apply cleanly on top of the setattr cleanup patches
that I sent a few weeks ago.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 2dd2dfa0

fs/cifs/dir.c

+10 −3
Original line number Diff line number Diff line
@@ -236,12 +236,14 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, 


			if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {

				args.uid = (__u64) current->fsuid;

				if (inode->i_mode & S_ISGID)

					args.gid = (__u64) inode->i_gid;

				else

					args.gid = (__u64) current->fsgid;

			} else {

				args.uid = NO_CHANGE_64;

				args.gid = NO_CHANGE_64;

			}



			CIFSSMBUnixSetInfo(xid, pTcon, full_path, &args,

				cifs_sb->local_nls,

				cifs_sb->mnt_cifs_flags &
@@ -270,7 +272,12 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, 
				    (cifs_sb->mnt_cifs_flags &

				     CIFS_MOUNT_SET_UID)) {

					newinode->i_uid = current->fsuid;

					newinode->i_gid = current->fsgid;

					if (inode->i_mode & S_ISGID)

						newinode->i_gid =

							inode->i_gid;

					else

						newinode->i_gid =

							current->fsgid;

				}

			}

		}

fs/cifs/inode.c

+15 −3
Original line number Diff line number Diff line
@@ -985,7 +985,12 @@ mkdir_get_info: 
		  * failed to get it from the server or was set bogus */

		if ((direntry->d_inode) && (direntry->d_inode->i_nlink < 2))

				direntry->d_inode->i_nlink = 2;



		mode &= ~current->fs->umask;

		/* must turn on setgid bit if parent dir has it */

		if (inode->i_mode & S_ISGID)

			mode |= S_ISGID;



		if (pTcon->unix_ext) {

			struct cifs_unix_set_info_args args = {

				.mode	= mode,
@@ -996,6 +1001,9 @@ mkdir_get_info: 
			};

			if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {

				args.uid = (__u64)current->fsuid;

				if (inode->i_mode & S_ISGID)

					args.gid = (__u64)inode->i_gid;

				else

					args.gid = (__u64)current->fsgid;

			} else {

				args.uid = NO_CHANGE_64;
@@ -1026,6 +1034,10 @@ mkdir_get_info: 
				     CIFS_MOUNT_SET_UID) {

					direntry->d_inode->i_uid =

						current->fsuid;

					if (inode->i_mode & S_ISGID)

						direntry->d_inode->i_gid =

							inode->i_gid;

					else

						direntry->d_inode->i_gid =

							current->fsgid;

				}

CRA Git | Maintained and supported by SUSTech CRA and CCSE