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

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

Pull more smb client updates from Steve French:

   - various updates for special file handling: symlink handling,
     support for creating sockets, cleanups, new mount options (e.g. to
     allow disabling using reparse points for them, and to allow
     overriding the way symlinks are saved), and fixes to error paths

   - fix for kerberos mounts (allow IAKerb)

   - SMB1 fix for stat and for setting SACL (auditing)

   - fix an incorrect error code mapping

   - cleanups"

* tag 'v6.14-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6: (21 commits)
  cifs: Fix parsing native symlinks directory/file type
  cifs: update internal version number
  cifs: Add support for creating WSL-style symlinks
  smb3: add support for IAKerb
  cifs: Fix struct FILE_ALL_INFO
  cifs: Add support for creating NFS-style symlinks
  cifs: Add support for creating native Windows sockets
  cifs: Add mount option -o reparse=none
  cifs: Add mount option -o symlink= for choosing symlink create type
  cifs: Fix creating and resolving absolute NT-style symlinks
  cifs: Simplify reparse point check in cifs_query_path_info() function
  cifs: Remove symlink member from cifs_open_info_data union
  cifs: Update description about ACL permissions
  cifs: Rename struct reparse_posix_data to reparse_nfs_data_buffer and move to common/smb2pdu.h
  cifs: Remove struct reparse_posix_data from struct cifs_open_info_data
  cifs: Remove unicode parameter from parse_reparse_point() function
  cifs: Fix getting and setting SACLs over SMB1
  cifs: Remove intermediate object of failed create SFU call
  cifs: Validate EAs for WSL reparse points
  cifs: Change translation of STATUS_PRIVILEGE_NOT_HELD to -EPERM
  ...
parents 8c198ffd a49da4ef

fs/smb/client/asn1.c

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ int cifs_neg_token_init_mech_type(void *context, size_t hdrlen, 
		server->sec_kerberos = true;

	else if (oid == OID_ntlmssp)

		server->sec_ntlmssp = true;

	else if (oid == OID_IAKerb)

		server->sec_iakerb = true;

	else {

		char buf[50];

fs/smb/client/cifs_spnego.c

+3 −1
Original line number Diff line number Diff line
@@ -138,11 +138,13 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo, 


	dp = description + strlen(description);



	/* for now, only sec=krb5 and sec=mskrb5 are valid */

	/* for now, only sec=krb5 and sec=mskrb5 and iakerb are valid */

	if (server->sec_kerberos)

		sprintf(dp, ";sec=krb5");

	else if (server->sec_mskerberos)

		sprintf(dp, ";sec=mskrb5");

	else if (server->sec_iakerb)

		sprintf(dp, ";sec=iakerb");

	else {

		cifs_dbg(VFS, "unknown or missing server auth type, use krb5\n");

		sprintf(dp, ";sec=krb5");

fs/smb/client/cifsacl.c

+15 −10
Original line number Diff line number Diff line
@@ -1395,7 +1395,7 @@ static int build_sec_desc(struct smb_ntsd *pntsd, struct smb_ntsd *pnntsd, 
#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY

struct smb_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *cifs_sb,

				      const struct cifs_fid *cifsfid, u32 *pacllen,

				      u32 __maybe_unused unused)

				      u32 info)

{

	struct smb_ntsd *pntsd = NULL;

	unsigned int xid;
@@ -1407,7 +1407,7 @@ struct smb_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *cifs_sb, 


	xid = get_xid();

	rc = CIFSSMBGetCIFSACL(xid, tlink_tcon(tlink), cifsfid->netfid, &pntsd,

				pacllen);

				pacllen, info);

	free_xid(xid);



	cifs_put_tlink(tlink);
@@ -1419,7 +1419,7 @@ struct smb_ntsd *get_cifs_acl_by_fid(struct cifs_sb_info *cifs_sb, 
}



static struct smb_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb,

		const char *path, u32 *pacllen)

		const char *path, u32 *pacllen, u32 info)

{

	struct smb_ntsd *pntsd = NULL;

	int oplock = 0;
@@ -1446,9 +1446,12 @@ static struct smb_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, 
		.fid = &fid,

	};



	if (info & SACL_SECINFO)

		oparms.desired_access |= SYSTEM_SECURITY;



	rc = CIFS_open(xid, &oparms, &oplock, NULL);

	if (!rc) {

		rc = CIFSSMBGetCIFSACL(xid, tcon, fid.netfid, &pntsd, pacllen);

		rc = CIFSSMBGetCIFSACL(xid, tcon, fid.netfid, &pntsd, pacllen, info);

		CIFSSMBClose(xid, tcon, fid.netfid);

	}
@@ -1472,7 +1475,7 @@ struct smb_ntsd *get_cifs_acl(struct cifs_sb_info *cifs_sb, 
	if (inode)

		open_file = find_readable_file(CIFS_I(inode), true);

	if (!open_file)

		return get_cifs_acl_by_path(cifs_sb, path, pacllen);

		return get_cifs_acl_by_path(cifs_sb, path, pacllen, info);



	pntsd = get_cifs_acl_by_fid(cifs_sb, &open_file->fid, pacllen, info);

	cifsFileInfo_put(open_file);
@@ -1485,7 +1488,7 @@ int set_cifs_acl(struct smb_ntsd *pnntsd, __u32 acllen, 
{

	int oplock = 0;

	unsigned int xid;

	int rc, access_flags;

	int rc, access_flags = 0;

	struct cifs_tcon *tcon;

	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);
@@ -1498,10 +1501,12 @@ int set_cifs_acl(struct smb_ntsd *pnntsd, __u32 acllen, 
	tcon = tlink_tcon(tlink);

	xid = get_xid();



	if (aclflag == CIFS_ACL_OWNER || aclflag == CIFS_ACL_GROUP)

		access_flags = WRITE_OWNER;

	else

		access_flags = WRITE_DAC;

	if (aclflag & CIFS_ACL_OWNER || aclflag & CIFS_ACL_GROUP)

		access_flags |= WRITE_OWNER;

	if (aclflag & CIFS_ACL_SACL)

		access_flags |= SYSTEM_SECURITY;

	if (aclflag & CIFS_ACL_DACL)

		access_flags |= WRITE_DAC;



	oparms = (struct cifs_open_parms) {

		.tcon = tcon,

fs/smb/client/cifsfs.c

+6 −0
Original line number Diff line number Diff line
@@ -715,6 +715,12 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
					    cifs_sb->ctx->backupgid));

	seq_show_option(s, "reparse",

			cifs_reparse_type_str(cifs_sb->ctx->reparse_type));

	if (cifs_sb->ctx->nonativesocket)

		seq_puts(s, ",nonativesocket");

	else

		seq_puts(s, ",nativesocket");

	seq_show_option(s, "symlink",

			cifs_symlink_type_str(get_cifs_symlink_type(cifs_sb)));



	seq_printf(s, ",rsize=%u", cifs_sb->ctx->rsize);

	seq_printf(s, ",wsize=%u", cifs_sb->ctx->wsize);

fs/smb/client/cifsfs.h

+2 −2
Original line number Diff line number Diff line
@@ -146,6 +146,6 @@ extern const struct export_operations cifs_export_ops; 
#endif /* CONFIG_CIFS_NFSD_EXPORT */



/* when changing internal version - update following two lines at same time */

#define SMB3_PRODUCT_BUILD 52

#define CIFS_VERSION   "2.52"

#define SMB3_PRODUCT_BUILD 53

#define CIFS_VERSION   "2.53"

#endif				/* _CIFSFS_H */