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

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

Merge tag '4.19-rc2-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fixes from Steve French:
 "Four small SMB3 fixes, three for stable, and one minor debug
  clarification"

* tag '4.19-rc2-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: connect to servername instead of IP for IPC$ share
  smb3: check for and properly advertise directory lease support
  smb3: minor debugging clarifications in rfc1001 len processing
  SMB3: Backup intent flag missing for directory opens with backupuid mounts
  fs/cifs: don't translate SFM_SLASH (U+F026) to backslash
parents ca16eb34 395a2076

fs/cifs/cifs_unicode.c

+0 −3
Original line number Diff line number Diff line
@@ -105,9 +105,6 @@ convert_sfm_char(const __u16 src_char, char *target) 
	case SFM_LESSTHAN:

		*target = '<';

		break;

	case SFM_SLASH:

		*target = '\\';

		break;

	case SFM_SPACE:

		*target = ' ';

		break;

fs/cifs/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -2547,7 +2547,7 @@ cifs_setup_ipc(struct cifs_ses *ses, struct smb_vol *volume_info) 
	if (tcon == NULL)

		return -ENOMEM;



	snprintf(unc, sizeof(unc), "\\\\%s\\IPC$", ses->serverName);

	snprintf(unc, sizeof(unc), "\\\\%s\\IPC$", ses->server->hostname);



	/* cannot fail */

	nls_codepage = load_nls_default();

fs/cifs/inode.c

+2 −0
Original line number Diff line number Diff line
@@ -467,6 +467,8 @@ cifs_sfu_type(struct cifs_fattr *fattr, const char *path, 
	oparms.cifs_sb = cifs_sb;

	oparms.desired_access = GENERIC_READ;

	oparms.create_options = CREATE_NOT_DIR;

	if (backup_cred(cifs_sb))

		oparms.create_options |= CREATE_OPEN_BACKUP_INTENT;

	oparms.disposition = FILE_OPEN;

	oparms.path = path;

	oparms.fid = &fid;

fs/cifs/smb2misc.c

+9 −5
Original line number Diff line number Diff line
@@ -248,16 +248,20 @@ smb2_check_message(char *buf, unsigned int len, struct TCP_Server_Info *srvr) 
		 * MacOS server pads after SMB2.1 write response with 3 bytes

		 * of junk. Other servers match RFC1001 len to actual

		 * SMB2/SMB3 frame length (header + smb2 response specific data)

		 * Some windows servers do too when compounding is used.

		 * Log the server error (once), but allow it and continue

		 * Some windows servers also pad up to 8 bytes when compounding.

		 * If pad is longer than eight bytes, log the server behavior

		 * (once), since may indicate a problem but allow it and continue

		 * since the frame is parseable.

		 */

		if (clc_len < len) {

			printk_once(KERN_WARNING

				"SMB2 server sent bad RFC1001 len %d not %d\n",

				len, clc_len);

			pr_warn_once(

			     "srv rsp padded more than expected. Length %d not %d for cmd:%d mid:%llu\n",

			     len, clc_len, command, mid);

			return 0;

		}

		pr_warn_once(

			"srv rsp too short, len %d not %d. cmd:%d mid:%llu\n",

			len, clc_len, command, mid);



		return 1;

	}

fs/cifs/smb2ops.c

+25 −10
Original line number Diff line number Diff line
@@ -630,6 +630,9 @@ smb2_is_path_accessible(const unsigned int xid, struct cifs_tcon *tcon, 
	oparms.tcon = tcon;

	oparms.desired_access = FILE_READ_ATTRIBUTES;

	oparms.disposition = FILE_OPEN;

	if (backup_cred(cifs_sb))

		oparms.create_options = CREATE_OPEN_BACKUP_INTENT;

	else

		oparms.create_options = 0;

	oparms.fid = &fid;

	oparms.reconnect = false;
@@ -779,6 +782,9 @@ smb2_query_eas(const unsigned int xid, struct cifs_tcon *tcon, 
	oparms.tcon = tcon;

	oparms.desired_access = FILE_READ_EA;

	oparms.disposition = FILE_OPEN;

	if (backup_cred(cifs_sb))

		oparms.create_options = CREATE_OPEN_BACKUP_INTENT;

	else

		oparms.create_options = 0;

	oparms.fid = &fid;

	oparms.reconnect = false;
@@ -858,6 +864,9 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon, 
	oparms.tcon = tcon;

	oparms.desired_access = FILE_WRITE_EA;

	oparms.disposition = FILE_OPEN;

	if (backup_cred(cifs_sb))

		oparms.create_options = CREATE_OPEN_BACKUP_INTENT;

	else

		oparms.create_options = 0;

	oparms.fid = &fid;

	oparms.reconnect = false;
@@ -1453,6 +1462,9 @@ smb2_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon, 
	oparms.tcon = tcon;

	oparms.desired_access = FILE_READ_ATTRIBUTES | FILE_READ_DATA;

	oparms.disposition = FILE_OPEN;

	if (backup_cred(cifs_sb))

		oparms.create_options = CREATE_OPEN_BACKUP_INTENT;

	else

		oparms.create_options = 0;

	oparms.fid = fid;

	oparms.reconnect = false;
@@ -1857,6 +1869,9 @@ smb2_query_symlink(const unsigned int xid, struct cifs_tcon *tcon, 
	oparms.tcon = tcon;

	oparms.desired_access = FILE_READ_ATTRIBUTES;

	oparms.disposition = FILE_OPEN;

	if (backup_cred(cifs_sb))

		oparms.create_options = CREATE_OPEN_BACKUP_INTENT;

	else

		oparms.create_options = 0;

	oparms.fid = &fid;

	oparms.reconnect = false;
@@ -3639,7 +3654,7 @@ struct smb_version_values smb21_values = { 
struct smb_version_values smb3any_values = {

	.version_string = SMB3ANY_VERSION_STRING,

	.protocol_id = SMB302_PROT_ID, /* doesn't matter, send protocol array */

	.req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION,

	.req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION | SMB2_GLOBAL_CAP_DIRECTORY_LEASING,

	.large_lock_type = 0,

	.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,

	.shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
@@ -3660,7 +3675,7 @@ struct smb_version_values smb3any_values = { 
struct smb_version_values smbdefault_values = {

	.version_string = SMBDEFAULT_VERSION_STRING,

	.protocol_id = SMB302_PROT_ID, /* doesn't matter, send protocol array */

	.req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION,

	.req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION | SMB2_GLOBAL_CAP_DIRECTORY_LEASING,

	.large_lock_type = 0,

	.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,

	.shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
@@ -3681,7 +3696,7 @@ struct smb_version_values smbdefault_values = { 
struct smb_version_values smb30_values = {

	.version_string = SMB30_VERSION_STRING,

	.protocol_id = SMB30_PROT_ID,

	.req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION,

	.req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION | SMB2_GLOBAL_CAP_DIRECTORY_LEASING,

	.large_lock_type = 0,

	.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,

	.shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
@@ -3702,7 +3717,7 @@ struct smb_version_values smb30_values = { 
struct smb_version_values smb302_values = {

	.version_string = SMB302_VERSION_STRING,

	.protocol_id = SMB302_PROT_ID,

	.req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION,

	.req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION | SMB2_GLOBAL_CAP_DIRECTORY_LEASING,

	.large_lock_type = 0,

	.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,

	.shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
@@ -3723,7 +3738,7 @@ struct smb_version_values smb302_values = { 
struct smb_version_values smb311_values = {

	.version_string = SMB311_VERSION_STRING,

	.protocol_id = SMB311_PROT_ID,

	.req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION,

	.req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION | SMB2_GLOBAL_CAP_DIRECTORY_LEASING,

	.large_lock_type = 0,

	.exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,

	.shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,