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

Commit 29e20f9c authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Steve French
Browse files

CIFS: Make CAP_* checks protocol independent 



Since both CIFS and SMB2 use ses->capabilities (server->capabilities)
field but flags are different we should make such checks protocol
independent.

Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarPavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent d60622eb

fs/cifs/cifsglob.h

+12 −2
Original line number Diff line number Diff line
@@ -258,6 +258,9 @@ struct smb_version_values { 
	size_t		max_header_size;

	size_t		read_rsp_size;

	__le16		lock_cmd;

	unsigned int	cap_unix;

	unsigned int	cap_nt_find;

	unsigned int	cap_large_files;

};



#define HEADER_SIZE(server) (server->vals->header_size)
@@ -408,7 +411,7 @@ struct TCP_Server_Info { 
	unsigned int max_vcs;	/* maximum number of smb sessions, at least

				   those that can be specified uniquely with

				   vcnumbers */

	int capabilities; /* allow selective disabling of caps by smb sess */

	unsigned int capabilities; /* selective disabling of caps by smb sess */

	int timeAdj;  /* Adjust for difference in server time zone in sec */

	__u64 CurrentMid;         /* multiplex id - rotating counter */

	char cryptkey[CIFS_CRYPTO_KEY_SIZE]; /* used by ntlm, ntlmv2 etc */
@@ -532,7 +535,7 @@ struct cifs_ses { 
	__u64 Suid;		/* remote smb uid  */

	uid_t linux_uid;        /* overriding owner of files on the mount */

	uid_t cred_uid;		/* owner of credentials */

	int capabilities;

	unsigned int capabilities;

	char serverName[SERVER_NAME_LEN_WITH_NULL * 2];	/* BB make bigger for

				TCP names - will ipv6 and sctp addresses fit? */

	char *user_name;	/* must not be null except during init of sess
@@ -554,6 +557,13 @@ struct cifs_ses { 
   which do not negotiate NTLM or POSIX dialects, but instead

   negotiate one of the older LANMAN dialects */

#define CIFS_SES_LANMAN 8



static inline bool

cap_unix(struct cifs_ses *ses)

{

	return ses->server->vals->cap_unix & ses->capabilities;

}



/*

 * there is one of these for each connection to a resource on a particular

 * session

fs/cifs/connect.c

+3 −3
Original line number Diff line number Diff line
@@ -3634,7 +3634,7 @@ cifs_mount(struct cifs_sb_info *cifs_sb, struct smb_vol *volume_info) 
	}



	/* tell server which Unix caps we support */

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

	if (cap_unix(tcon->ses)) {

		/* reset of caps checks mount to see if unix extensions

		   disabled for just this mount */

		reset_cifs_unix_caps(xid, tcon, cifs_sb, volume_info);
@@ -3993,7 +3993,7 @@ cifs_setup_session(const unsigned int xid, struct cifs_ses *ses, 
	ses->flags = 0;

	ses->capabilities = server->capabilities;

	if (linuxExtEnabled == 0)

		ses->capabilities &= (~CAP_UNIX);

		ses->capabilities &= (~server->vals->cap_unix);



	cFYI(1, "Security Mode: 0x%x Capabilities: 0x%x TimeAdjust: %d",

		 server->sec_mode, server->capabilities, server->timeAdj);
@@ -4100,7 +4100,7 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, uid_t fsuid) 
		goto out;

	}



	if (ses->capabilities & CAP_UNIX)

	if (cap_unix(ses))

		reset_cifs_unix_caps(0, tcon, NULL, vol_info);

out:

	kfree(vol_info->username);

fs/cifs/dir.c

+1 −2
Original line number Diff line number Diff line
@@ -182,8 +182,7 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid, 
		goto out;

	}



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

	    !tcon->broken_posix_open &&

	if (tcon->unix_ext && cap_unix(tcon->ses) && !tcon->broken_posix_open &&

	    (CIFS_UNIX_POSIX_PATH_OPS_CAP &

			le64_to_cpu(tcon->fsUnixInfo.Capability))) {

		rc = cifs_posix_open(full_path, &newinode,

fs/cifs/file.c

+16 −17
Original line number Diff line number Diff line
@@ -385,8 +385,7 @@ int cifs_open(struct inode *inode, struct file *file) 
		oplock = 0;



	if (!tcon->broken_posix_open && tcon->unix_ext &&

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

	    (CIFS_UNIX_POSIX_PATH_OPS_CAP &

	    cap_unix(tcon->ses) && (CIFS_UNIX_POSIX_PATH_OPS_CAP &

				le64_to_cpu(tcon->fsUnixInfo.Capability))) {

		/* can not refresh inode info since size could be stale */

		rc = cifs_posix_open(full_path, &inode, inode->i_sb,
@@ -509,10 +508,9 @@ static int cifs_reopen_file(struct cifsFileInfo *pCifsFile, bool can_flush) 
	else

		oplock = 0;



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

	if (tcon->unix_ext && cap_unix(tcon->ses) &&

	    (CIFS_UNIX_POSIX_PATH_OPS_CAP &

				le64_to_cpu(tcon->fsUnixInfo.Capability))) {



		/*

		 * O_CREAT, O_EXCL and O_TRUNC already had their effect on the

		 * original open. Must mask them off for a reopen.
@@ -1071,7 +1069,7 @@ cifs_push_locks(struct cifsFileInfo *cfile) 
	struct cifs_sb_info *cifs_sb = CIFS_SB(cfile->dentry->d_sb);

	struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);



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

	if (cap_unix(tcon->ses) &&

	    (CIFS_UNIX_FCNTL_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability)) &&

	    ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0))

		return cifs_push_posix_locks(cfile);
@@ -1419,7 +1417,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *flock) 
	netfid = cfile->netfid;

	cinode = CIFS_I(file->f_path.dentry->d_inode);



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

	if (cap_unix(tcon->ses) &&

	    (CIFS_UNIX_FCNTL_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability)) &&

	    ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0))

		posix_lck = true;
@@ -2745,7 +2743,7 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size, 
	unsigned int current_read_size;

	unsigned int rsize;

	struct cifs_sb_info *cifs_sb;

	struct cifs_tcon *pTcon;

	struct cifs_tcon *tcon;

	unsigned int xid;

	char *current_offset;

	struct cifsFileInfo *open_file;
@@ -2765,7 +2763,7 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size, 
		return rc;

	}

	open_file = file->private_data;

	pTcon = tlink_tcon(open_file->tlink);

	tcon = tlink_tcon(open_file->tlink);



	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)

		pid = open_file->pid;
@@ -2779,11 +2777,12 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size, 
	     read_size > total_read;

	     total_read += bytes_read, current_offset += bytes_read) {

		current_read_size = min_t(uint, read_size - total_read, rsize);



		/* For windows me and 9x we do not want to request more

		than it negotiated since it will refuse the read then */

		if ((pTcon->ses) &&

			!(pTcon->ses->capabilities & CAP_LARGE_FILES)) {

		/*

		 * For windows me and 9x we do not want to request more than it

		 * negotiated since it will refuse the read then.

		 */

		if ((tcon->ses) && !(tcon->ses->capabilities &

				tcon->ses->server->vals->cap_large_files)) {

			current_read_size = min_t(uint, current_read_size,

					CIFSMaxBufSize);

		}
@@ -2796,7 +2795,7 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size, 
			}

			io_parms.netfid = open_file->netfid;

			io_parms.pid = pid;

			io_parms.tcon = pTcon;

			io_parms.tcon = tcon;

			io_parms.offset = *poffset;

			io_parms.length = current_read_size;

			rc = CIFSSMBRead(xid, &io_parms, &bytes_read,
@@ -2810,7 +2809,7 @@ static ssize_t cifs_read(struct file *file, char *read_data, size_t read_size, 
				return rc;

			}

		} else {

			cifs_stats_bytes_read(pTcon, total_read);

			cifs_stats_bytes_read(tcon, total_read);

			*poffset += bytes_read;

		}

	}

fs/cifs/inode.c

+12 −14
Original line number Diff line number Diff line
@@ -1149,8 +1149,7 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry) 
		goto unlink_out;

	}



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

		(CIFS_UNIX_POSIX_PATH_OPS_CAP &

	if (cap_unix(tcon->ses) && (CIFS_UNIX_POSIX_PATH_OPS_CAP &

				le64_to_cpu(tcon->fsUnixInfo.Capability))) {

		rc = CIFSPOSIXDelFile(xid, tcon, full_path,

			SMB_POSIX_UNLINK_FILE_TARGET, cifs_sb->local_nls,
@@ -1226,7 +1225,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, umode_t mode) 
	unsigned int xid;

	struct cifs_sb_info *cifs_sb;

	struct tcon_link *tlink;

	struct cifs_tcon *pTcon;

	struct cifs_tcon *tcon;

	char *full_path = NULL;

	struct inode *newinode = NULL;

	struct cifs_fattr fattr;
@@ -1237,7 +1236,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, umode_t mode) 
	tlink = cifs_sb_tlink(cifs_sb);

	if (IS_ERR(tlink))

		return PTR_ERR(tlink);

	pTcon = tlink_tcon(tlink);

	tcon = tlink_tcon(tlink);



	xid = get_xid();
@@ -1247,9 +1246,8 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, umode_t mode) 
		goto mkdir_out;

	}



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

		(CIFS_UNIX_POSIX_PATH_OPS_CAP &

			le64_to_cpu(pTcon->fsUnixInfo.Capability))) {

	if (cap_unix(tcon->ses) && (CIFS_UNIX_POSIX_PATH_OPS_CAP &

				le64_to_cpu(tcon->fsUnixInfo.Capability))) {

		u32 oplock = 0;

		FILE_UNIX_BASIC_INFO *pInfo =

			kzalloc(sizeof(FILE_UNIX_BASIC_INFO), GFP_KERNEL);
@@ -1259,7 +1257,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, umode_t mode) 
		}



		mode &= ~current_umask();

		rc = CIFSPOSIXCreate(xid, pTcon, SMB_O_DIRECTORY | SMB_O_CREAT,

		rc = CIFSPOSIXCreate(xid, tcon, SMB_O_DIRECTORY | SMB_O_CREAT,

				mode, NULL /* netfid */, pInfo, &oplock,

				full_path, cifs_sb->local_nls,

				cifs_sb->mnt_cifs_flags &
@@ -1303,14 +1301,14 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, umode_t mode) 
	}

mkdir_retry_old:

	/* BB add setting the equivalent of mode via CreateX w/ACLs */

	rc = CIFSSMBMkDir(xid, pTcon, full_path, cifs_sb->local_nls,

	rc = CIFSSMBMkDir(xid, tcon, full_path, cifs_sb->local_nls,

			  cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);

	if (rc) {

		cFYI(1, "cifs_mkdir returned 0x%x", rc);

		d_drop(direntry);

	} else {

mkdir_get_info:

		if (pTcon->unix_ext)

		if (tcon->unix_ext)

			rc = cifs_get_inode_info_unix(&newinode, full_path,

						      inode->i_sb, xid);

		else
@@ -1328,7 +1326,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, umode_t mode) 
		if (inode->i_mode & S_ISGID)

			mode |= S_ISGID;



		if (pTcon->unix_ext) {

		if (tcon->unix_ext) {

			struct cifs_unix_set_info_args args = {

				.mode	= mode,

				.ctime	= NO_CHANGE_64,
@@ -1346,7 +1344,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, umode_t mode) 
				args.uid = NO_CHANGE_64;

				args.gid = NO_CHANGE_64;

			}

			CIFSSMBUnixSetPathInfo(xid, pTcon, full_path, &args,

			CIFSSMBUnixSetPathInfo(xid, tcon, full_path, &args,

					       cifs_sb->local_nls,

					       cifs_sb->mnt_cifs_flags &

						CIFS_MOUNT_MAP_SPECIAL_CHR);
@@ -1361,7 +1359,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, umode_t mode) 
				cifsInode = CIFS_I(newinode);

				dosattrs = cifsInode->cifsAttrs|ATTR_READONLY;

				pInfo.Attributes = cpu_to_le32(dosattrs);

				tmprc = CIFSSMBSetPathInfo(xid, pTcon,

				tmprc = CIFSSMBSetPathInfo(xid, tcon,

						full_path, &pInfo,

						cifs_sb->local_nls,

						cifs_sb->mnt_cifs_flags &