Commit f82e7b57 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '5.8-rc-smb3-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6 

Pull more cifs updates from Steve French:
 "12 cifs/smb3 fixes, 2 for stable.

   - add support for idsfromsid on create and chgrp/chown allowing
     ability to save owner information more naturally for some workloads

   - improve query info (getattr) when SMB3.1.1 posix extensions are
     negotiated by using new query info level"

* tag '5.8-rc-smb3-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6:
  smb3: Add debug message for new file creation with idsfromsid mount option
  cifs: fix chown and chgrp when idsfromsid mount option enabled
  smb3: allow uid and gid owners to be set on create with idsfromsid mount option
  smb311: Add tracepoints for new compound posix query info
  smb311: add support for using info level for posix extensions query
  smb311: Add support for lookup with posix extensions query info
  smb311: Add support for SMB311 query info (non-compounded)
  SMB311: Add support for query info using posix extensions (level 100)
  smb3: add indatalen that can be a non-zero value to calculation of credit charge in smb2 ioctl
  smb3: fix typo in mount options displayed in /proc/mounts
  cifs: Add get_security_type_str function to return sec type.
  smb3: extend fscache mount volume coherency check
parents 4f9b3a37 a7a519a4

fs/cifs/cache.c

+2 −7
Original line number Diff line number Diff line
@@ -53,13 +53,6 @@ const struct fscache_cookie_def cifs_fscache_server_index_def = { 
	.type = FSCACHE_COOKIE_TYPE_INDEX,

};



/*

 * Auxiliary data attached to CIFS superblock within the cache

 */

struct cifs_fscache_super_auxdata {

	u64	resource_id;		/* unique server resource id */

};



char *extract_sharename(const char *treename)

{

	const char *src;
@@ -98,6 +91,8 @@ fscache_checkaux cifs_fscache_super_check_aux(void *cookie_netfs_data, 


	memset(&auxdata, 0, sizeof(auxdata));

	auxdata.resource_id = tcon->resource_id;

	auxdata.vol_create_time = tcon->vol_create_time;

	auxdata.vol_serial_number = tcon->vol_serial_number;



	if (memcmp(data, &auxdata, datalen) != 0)

		return FSCACHE_CHECKAUX_OBSOLETE;

fs/cifs/cifs_debug.c

+1 −3
Original line number Diff line number Diff line
@@ -221,8 +221,6 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
	struct cifs_ses *ses;

	struct cifs_tcon *tcon;

	int i, j;

	const char *security_types[] = {"Unspecified", "LANMAN", "NTLM",

                                       "NTLMv2", "RawNTLMSSP", "Kerberos"};



	seq_puts(m,

		    "Display Internal CIFS Data Structures for Debugging\n"
@@ -379,7 +377,7 @@ skip_rdma: 
			}



			seq_printf(m,"Security type: %s\n",

                                      security_types[server->ops->select_sectype(server, ses->sectype)]);

				get_security_type_str(server->ops->select_sectype(server, ses->sectype)));



			if (server->rdma)

				seq_printf(m, "RDMA\n\t");

fs/cifs/cifsacl.c

+64 −15
Original line number Diff line number Diff line
@@ -849,6 +849,28 @@ unsigned int setup_special_mode_ACE(struct cifs_ace *pntace, __u64 nmode) 
	return ace_size;

}



unsigned int setup_special_user_owner_ACE(struct cifs_ace *pntace)

{

	int i;

	unsigned int ace_size = 28;



	pntace->type = ACCESS_ALLOWED_ACE_TYPE;

	pntace->flags = 0x0;

	pntace->access_req = cpu_to_le32(GENERIC_ALL);

	pntace->sid.num_subauth = 3;

	pntace->sid.revision = 1;

	for (i = 0; i < NUM_AUTHS; i++)

		pntace->sid.authority[i] = sid_unix_NFS_users.authority[i];



	pntace->sid.sub_auth[0] = sid_unix_NFS_users.sub_auth[0];

	pntace->sid.sub_auth[1] = sid_unix_NFS_users.sub_auth[1];

	pntace->sid.sub_auth[2] = cpu_to_le32(current_fsgid().val);



	/* size = 1 + 1 + 2 + 4 + 1 + 1 + 6 + (psid->num_subauth*4) */

	pntace->size = cpu_to_le16(ace_size);

	return ace_size;

}



static int set_chmod_dacl(struct cifs_acl *pndacl, struct cifs_sid *pownersid,

			struct cifs_sid *pgrpsid, __u64 nmode, bool modefromsid)

{
@@ -978,7 +1000,7 @@ static int parse_sec_desc(struct cifs_sb_info *cifs_sb, 
/* Convert permission bits from mode to equivalent CIFS ACL */

static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd,

	__u32 secdesclen, __u64 nmode, kuid_t uid, kgid_t gid,

	bool mode_from_sid, int *aclflag)

	bool mode_from_sid, bool id_from_sid, int *aclflag)

{

	int rc = 0;

	__u32 dacloffset;
@@ -1019,6 +1041,16 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd, 
			if (!nowner_sid_ptr)

				return -ENOMEM;

			id = from_kuid(&init_user_ns, uid);

			if (id_from_sid) {

				struct owner_sid *osid = (struct owner_sid *)nowner_sid_ptr;

				/* Populate the user ownership fields S-1-5-88-1 */

				osid->Revision = 1;

				osid->NumAuth = 3;

				osid->Authority[5] = 5;

				osid->SubAuthorities[0] = cpu_to_le32(88);

				osid->SubAuthorities[1] = cpu_to_le32(1);

				osid->SubAuthorities[2] = cpu_to_le32(id);

			} else { /* lookup sid with upcall */

				rc = id_to_sid(id, SIDOWNER, nowner_sid_ptr);

				if (rc) {

					cifs_dbg(FYI, "%s: Mapping error %d for owner id %d\n",
@@ -1026,6 +1058,7 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd, 
					kfree(nowner_sid_ptr);

					return rc;

				}

			}

			cifs_copy_sid(owner_sid_ptr, nowner_sid_ptr);

			kfree(nowner_sid_ptr);

			*aclflag = CIFS_ACL_OWNER;
@@ -1039,6 +1072,16 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd, 
			if (!ngroup_sid_ptr)

				return -ENOMEM;

			id = from_kgid(&init_user_ns, gid);

			if (id_from_sid) {

				struct owner_sid *gsid = (struct owner_sid *)ngroup_sid_ptr;

				/* Populate the group ownership fields S-1-5-88-2 */

				gsid->Revision = 1;

				gsid->NumAuth = 3;

				gsid->Authority[5] = 5;

				gsid->SubAuthorities[0] = cpu_to_le32(88);

				gsid->SubAuthorities[1] = cpu_to_le32(2);

				gsid->SubAuthorities[2] = cpu_to_le32(id);

			} else { /* lookup sid with upcall */

				rc = id_to_sid(id, SIDGROUP, ngroup_sid_ptr);

				if (rc) {

					cifs_dbg(FYI, "%s: Mapping error %d for group id %d\n",
@@ -1046,6 +1089,7 @@ static int build_sec_desc(struct cifs_ntsd *pntsd, struct cifs_ntsd *pnntsd, 
					kfree(ngroup_sid_ptr);

					return rc;

				}

			}

			cifs_copy_sid(group_sid_ptr, ngroup_sid_ptr);

			kfree(ngroup_sid_ptr);

			*aclflag = CIFS_ACL_GROUP;
@@ -1247,7 +1291,7 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 nmode, 
	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);

	struct smb_version_operations *ops;

	bool mode_from_sid;

	bool mode_from_sid, id_from_sid;



	if (IS_ERR(tlink))

		return PTR_ERR(tlink);
@@ -1290,8 +1334,13 @@ id_mode_to_cifs_acl(struct inode *inode, const char *path, __u64 nmode, 
	else

		mode_from_sid = false;



	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UID_FROM_ACL)

		id_from_sid = true;

	else

		id_from_sid = false;



	rc = build_sec_desc(pntsd, pnntsd, secdesclen, nmode, uid, gid,

			    mode_from_sid, &aclflag);

			    mode_from_sid, id_from_sid, &aclflag);



	cifs_dbg(NOISY, "build_sec_desc rc: %d\n", rc);

fs/cifs/cifsacl.h

+15 −0
Original line number Diff line number Diff line
@@ -176,6 +176,21 @@ struct smb3_acl { 
	__le16 Sbz2; /* MBZ */

} __packed;



/*

 * Used to store the special 'NFS SIDs' used to persist the POSIX uid and gid

 * See See http://technet.microsoft.com/en-us/library/hh509017(v=ws.10).aspx

 */

struct owner_sid {

	u8 Revision;

	u8 NumAuth;

	u8 Authority[6];

	__le32 SubAuthorities[3];

} __packed;



struct owner_group_sids {

	struct owner_sid owner;

	struct owner_sid group;

} __packed;



/*

 * Minimum security identifier can be one for system defined Users

fs/cifs/cifsfs.c

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
	seq_printf(s, ",actimeo=%lu", cifs_sb->actimeo / HZ);



	if (tcon->ses->chan_max > 1)

		seq_printf(s, ",multichannel,max_channel=%zu",

		seq_printf(s, ",multichannel,max_channels=%zu",

			   tcon->ses->chan_max);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE