Merge tag '5.6-rc1-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 (288b27a0) · Commits · 戴 / test

fs/cifs/cifsacl.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -601,7 +601,7 @@ static void access_flags_to_mode(__le32 ace_flags, int type, umode_t *pmode,
		((flags & FILE_EXEC_RIGHTS) == FILE_EXEC_RIGHTS))
		pmode \|= (S_IXUGO & (pbits_to_set));

		cifs_dbg(NOISY, "access flags 0x%x mode now 0x%x\n", flags, *pmode);
		cifs_dbg(NOISY, "access flags 0x%x mode now %04o\n", flags, *pmode);
		return;
		}

		@@ -630,7 +630,7 @@ static void mode_to_access_flags(umode_t mode, umode_t bits_to_use,
		if (mode & S_IXUGO)
		*pace_flags \|= SET_FILE_EXEC_RIGHTS;

		cifs_dbg(NOISY, "mode: 0x%x, access flags now 0x%x\n",
		cifs_dbg(NOISY, "mode: %04o, access flags now 0x%x\n",
		mode, *pace_flags);
		return;
		}

fs/cifs/cifsfs.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -414,7 +414,7 @@ cifs_show_security(struct seq_file s, struct cifs_ses ses)
		seq_puts(s, "ntlm");
		break;
		case Kerberos:
		seq_printf(s, "krb5,cruid=%u", from_kuid_munged(&init_user_ns,ses->cred_uid));
		seq_puts(s, "krb5");
		break;
		case RawNTLMSSP:
		seq_puts(s, "ntlmssp");
		@@ -427,6 +427,10 @@ cifs_show_security(struct seq_file s, struct cifs_ses ses)

		if (ses->sign)
		seq_puts(s, "i");

		if (ses->sectype == Kerberos)
		seq_printf(s, ",cruid=%u",
		from_kuid_munged(&init_user_ns, ses->cred_uid));
		}

		static void

fs/cifs/connect.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4151,7 +4151,7 @@ int cifs_setup_cifs_sb(struct smb_vol *pvolume_info,
		cifs_sb->mnt_gid = pvolume_info->linux_gid;
		cifs_sb->mnt_file_mode = pvolume_info->file_mode;
		cifs_sb->mnt_dir_mode = pvolume_info->dir_mode;
		cifs_dbg(FYI, "file mode: 0x%hx dir mode: 0x%hx\n",
		cifs_dbg(FYI, "file mode: %04ho dir mode: %04ho\n",
		cifs_sb->mnt_file_mode, cifs_sb->mnt_dir_mode);

		cifs_sb->actimeo = pvolume_info->actimeo;

fs/cifs/inode.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1648,7 +1648,7 @@ int cifs_mkdir(struct inode inode, struct dentry direntry, umode_t mode)
		struct TCP_Server_Info *server;
		char *full_path;

		cifs_dbg(FYI, "In cifs_mkdir, mode = 0x%hx inode = 0x%p\n",
		cifs_dbg(FYI, "In cifs_mkdir, mode = %04ho inode = 0x%p\n",
		mode, inode);

		cifs_sb = CIFS_SB(inode->i_sb);

fs/cifs/smb2ops.c

+35 −1

Original line number	Diff line number	Diff line
		@@ -1116,7 +1116,8 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
		void *data[1];
		struct smb2_file_full_ea_info *ea = NULL;
		struct kvec close_iov[1];
		int rc;
		struct smb2_query_info_rsp *rsp;
		int rc, used_len = 0;

		if (smb3_encryption_required(tcon))
		flags \|= CIFS_TRANSFORM_REQ;
		@@ -1139,6 +1140,38 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
		cifs_sb);
		if (rc == -ENODATA)
		goto sea_exit;
		} else {
		/* If we are adding a attribute we should first check
		* if there will be enough space available to store
		* the new EA. If not we should not add it since we
		* would not be able to even read the EAs back.
		*/
		rc = smb2_query_info_compound(xid, tcon, utf16_path,
		FILE_READ_EA,
		FILE_FULL_EA_INFORMATION,
		SMB2_O_INFO_FILE,
		CIFSMaxBufSize -
		MAX_SMB2_CREATE_RESPONSE_SIZE -
		MAX_SMB2_CLOSE_RESPONSE_SIZE,
		&rsp_iov[1], &resp_buftype[1], cifs_sb);
		if (rc == 0) {
		rsp = (struct smb2_query_info_rsp *)rsp_iov[1].iov_base;
		used_len = le32_to_cpu(rsp->OutputBufferLength);
		}
		free_rsp_buf(resp_buftype[1], rsp_iov[1].iov_base);
		resp_buftype[1] = CIFS_NO_BUFFER;
		memset(&rsp_iov[1], 0, sizeof(rsp_iov[1]));
		rc = 0;

		/* Use a fudge factor of 256 bytes in case we collide
		* with a different set_EAs command.
		*/
		if(CIFSMaxBufSize - MAX_SMB2_CREATE_RESPONSE_SIZE -
		MAX_SMB2_CLOSE_RESPONSE_SIZE - 256 <
		used_len + ea_name_len + ea_value_len + 1) {
		rc = -ENOSPC;
		goto sea_exit;
		}
		}
		}

		@@ -4795,6 +4828,7 @@ struct smb_version_operations smb21_operations = {
		.wp_retry_size = smb2_wp_retry_size,
		.dir_needs_close = smb2_dir_needs_close,
		.enum_snapshots = smb3_enum_snapshots,
		.notify = smb3_notify,
		.get_dfs_refer = smb2_get_dfs_refer,
		.select_sectype = smb2_select_sectype,
		#ifdef CONFIG_CIFS_XATTR

Admin message