Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ce53fc4 authored by Steve French's avatar Steve French
Browse files

[CIFS] CIFS should honour umask 



This patch makes CIFS honour a process' umask like other filesystems.
Of course the server is still free to munge the permissions if it wants
to; but the client will send the "right" permissions to begin with.

A few caveats:

1) It only applies to filesystems that have CAP_UNIX (aka support unix
extensions)
2) It applies the correct mode to the follow up CIFSSMBUnixSetPerms()
after remote creation

When mode to CIFS/NTFS ACL mapping is complete we can do the
same thing for that case for servers which do not
support the Unix Extensions.

Signed-off-by: default avatarMatt Keenen <matt@opcode-solutions.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 100c1ddc

fs/cifs/dir.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -208,7 +208,8 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, 
		/* If Open reported that we actually created a file

		/* If Open reported that we actually created a file

		then we now have to set the mode if possible */

		then we now have to set the mode if possible */

		if ((cifs_sb->tcon->ses->capabilities & CAP_UNIX) &&

		if ((cifs_sb->tcon->ses->capabilities & CAP_UNIX) &&

			(oplock & CIFS_CREATE_ACTION))

			(oplock & CIFS_CREATE_ACTION)) {

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

			if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {

			if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {

				CIFSSMBUnixSetPerms(xid, pTcon, full_path, mode,

				CIFSSMBUnixSetPerms(xid, pTcon, full_path, mode,

					(__u64)current->fsuid,

					(__u64)current->fsuid,
@@ -226,7 +227,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode, 
					cifs_sb->mnt_cifs_flags &

					cifs_sb->mnt_cifs_flags &

						CIFS_MOUNT_MAP_SPECIAL_CHR);

						CIFS_MOUNT_MAP_SPECIAL_CHR);

			}

			}

		else {

		} else {

			/* BB implement mode setting via Windows security

			/* BB implement mode setting via Windows security

			   descriptors e.g. */

			   descriptors e.g. */

			/* CIFSSMBWinSetPerms(xid,pTcon,path,mode,-1,-1,nls);*/

			/* CIFSSMBWinSetPerms(xid,pTcon,path,mode,-1,-1,nls);*/
@@ -336,6 +337,7 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode, 
	if (full_path == NULL)

	if (full_path == NULL)

		rc = -ENOMEM;

		rc = -ENOMEM;

	else if (pTcon->ses->capabilities & CAP_UNIX) {

	else if (pTcon->ses->capabilities & CAP_UNIX) {

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

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {

			rc = CIFSSMBUnixSetPerms(xid, pTcon, full_path,

			rc = CIFSSMBUnixSetPerms(xid, pTcon, full_path,

				mode, (__u64)current->fsuid,

				mode, (__u64)current->fsuid,

fs/cifs/inode.c

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

		  * failed to get it from the server or was set bogus */ 

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

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

				direntry->d_inode->i_nlink = 2; 

				direntry->d_inode->i_nlink = 2; 

		if (cifs_sb->tcon->ses->capabilities & CAP_UNIX)

		if (cifs_sb->tcon->ses->capabilities & CAP_UNIX) {

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

			if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {

			if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {

				CIFSSMBUnixSetPerms(xid, pTcon, full_path,

				CIFSSMBUnixSetPerms(xid, pTcon, full_path,

						    mode,

						    mode,
@@ -1004,7 +1005,7 @@ mkdir_get_info: 
						    cifs_sb->mnt_cifs_flags & 

						    cifs_sb->mnt_cifs_flags & 

						    CIFS_MOUNT_MAP_SPECIAL_CHR);

						    CIFS_MOUNT_MAP_SPECIAL_CHR);

			}

			}

		else {

		} else {

			/* BB to be implemented via Windows secrty descriptors

			/* BB to be implemented via Windows secrty descriptors

			   eg CIFSSMBWinSetPerms(xid, pTcon, full_path, mode,

			   eg CIFSSMBWinSetPerms(xid, pTcon, full_path, mode,

						 -1, -1, local_nls); */

						 -1, -1, local_nls); */