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

Merge tag 'v6.9-rc3-SMB3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 

Pull smb client fixes from Steve French:

 - fix for oops in cifs_get_fattr of deleted files

 - fix for the remote open counter going negative in some directory
   lease cases

 - fix for mkfifo to instantiate dentry to avoid possible crash

 - important fix to allow handling key rotation for mount and remount
   (ie cases that are becoming more common when password that was used
   for the mount will expire soon but will be replaced by new password)

* tag 'v6.9-rc3-SMB3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  smb3: fix broken reconnect when password changing on the server by allowing password rotation
  smb: client: instantiate when creating SFU files
  smb3: fix Open files on server counter going negative
  smb: client: fix NULL ptr deref in cifs_mark_open_handles_for_deleted_file()
parents 8f2c0577 35f83426

fs/smb/client/cached_dir.c

+2 −2
Original line number Diff line number Diff line
@@ -433,8 +433,8 @@ smb2_close_cached_fid(struct kref *ref) 
	if (cfid->is_open) {

		rc = SMB2_close(0, cfid->tcon, cfid->fid.persistent_fid,

			   cfid->fid.volatile_fid);

		if (rc != -EBUSY && rc != -EAGAIN)

			atomic_dec(&cfid->tcon->num_remote_opens);

		if (rc) /* should we retry on -EBUSY or -EAGAIN? */

			cifs_dbg(VFS, "close cached dir rc %d\n", rc);

	}



	free_cached_dir(cfid);

fs/smb/client/cifsglob.h

+1 −0
Original line number Diff line number Diff line
@@ -1077,6 +1077,7 @@ struct cifs_ses { 
				   and after mount option parsing we fill it */

	char *domainName;

	char *password;

	char *password2; /* When key rotation used, new password may be set before it expires */

	char workstation_name[CIFS_MAX_WORKSTATION_LEN];

	struct session_key auth_key;

	struct ntlmssp_auth *ntlmssp; /* ciphertext, flags, server challenge */

fs/smb/client/connect.c

+8 −0
Original line number Diff line number Diff line
@@ -2183,6 +2183,7 @@ cifs_set_cifscreds(struct smb3_fs_context *ctx, struct cifs_ses *ses) 
	}



	++delim;

	/* BB consider adding support for password2 (Key Rotation) for multiuser in future */

	ctx->password = kstrndup(delim, len, GFP_KERNEL);

	if (!ctx->password) {

		cifs_dbg(FYI, "Unable to allocate %zd bytes for password\n",
@@ -2206,6 +2207,7 @@ cifs_set_cifscreds(struct smb3_fs_context *ctx, struct cifs_ses *ses) 
			kfree(ctx->username);

			ctx->username = NULL;

			kfree_sensitive(ctx->password);

			/* no need to free ctx->password2 since not allocated in this path */

			ctx->password = NULL;

			goto out_key_put;

		}
@@ -2317,6 +2319,12 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb3_fs_context *ctx) 
		if (!ses->password)

			goto get_ses_fail;

	}

	/* ctx->password freed at unmount */

	if (ctx->password2) {

		ses->password2 = kstrdup(ctx->password2, GFP_KERNEL);

		if (!ses->password2)

			goto get_ses_fail;

	}

	if (ctx->domainname) {

		ses->domainName = kstrdup(ctx->domainname, GFP_KERNEL);

		if (!ses->domainName)

fs/smb/client/fs_context.c

+21 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ const struct fs_parameter_spec smb3_fs_parameters[] = { 
	fsparam_string("username", Opt_user),

	fsparam_string("pass", Opt_pass),

	fsparam_string("password", Opt_pass),

	fsparam_string("password2", Opt_pass2),

	fsparam_string("ip", Opt_ip),

	fsparam_string("addr", Opt_ip),

	fsparam_string("domain", Opt_domain),
@@ -345,6 +346,7 @@ smb3_fs_context_dup(struct smb3_fs_context *new_ctx, struct smb3_fs_context *ctx 
	new_ctx->nodename = NULL;

	new_ctx->username = NULL;

	new_ctx->password = NULL;

	new_ctx->password2 = NULL;

	new_ctx->server_hostname = NULL;

	new_ctx->domainname = NULL;

	new_ctx->UNC = NULL;
@@ -357,6 +359,7 @@ smb3_fs_context_dup(struct smb3_fs_context *new_ctx, struct smb3_fs_context *ctx 
	DUP_CTX_STR(prepath);

	DUP_CTX_STR(username);

	DUP_CTX_STR(password);

	DUP_CTX_STR(password2);

	DUP_CTX_STR(server_hostname);

	DUP_CTX_STR(UNC);

	DUP_CTX_STR(source);
@@ -905,6 +908,8 @@ static int smb3_reconfigure(struct fs_context *fc) 
	else  {

		kfree_sensitive(ses->password);

		ses->password = kstrdup(ctx->password, GFP_KERNEL);

		kfree_sensitive(ses->password2);

		ses->password2 = kstrdup(ctx->password2, GFP_KERNEL);

	}

	STEAL_STRING(cifs_sb, ctx, domainname);

	STEAL_STRING(cifs_sb, ctx, nodename);
@@ -1305,6 +1310,18 @@ static int smb3_fs_context_parse_param(struct fs_context *fc, 
			goto cifs_parse_mount_err;

		}

		break;

	case Opt_pass2:

		kfree_sensitive(ctx->password2);

		ctx->password2 = NULL;

		if (strlen(param->string) == 0)

			break;



		ctx->password2 = kstrdup(param->string, GFP_KERNEL);

		if (ctx->password2 == NULL) {

			cifs_errorf(fc, "OOM when copying password2 string\n");

			goto cifs_parse_mount_err;

		}

		break;

	case Opt_ip:

		if (strlen(param->string) == 0) {

			ctx->got_ip = false;
@@ -1608,6 +1625,8 @@ static int smb3_fs_context_parse_param(struct fs_context *fc, 
 cifs_parse_mount_err:

	kfree_sensitive(ctx->password);

	ctx->password = NULL;

	kfree_sensitive(ctx->password2);

	ctx->password2 = NULL;

	return -EINVAL;

}
@@ -1713,6 +1732,8 @@ smb3_cleanup_fs_context_contents(struct smb3_fs_context *ctx) 
	ctx->username = NULL;

	kfree_sensitive(ctx->password);

	ctx->password = NULL;

	kfree_sensitive(ctx->password2);

	ctx->password2 = NULL;

	kfree(ctx->server_hostname);

	ctx->server_hostname = NULL;

	kfree(ctx->UNC);

fs/smb/client/fs_context.h

+2 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ enum cifs_param { 
	Opt_source,

	Opt_user,

	Opt_pass,

	Opt_pass2,

	Opt_ip,

	Opt_domain,

	Opt_srcaddr,
@@ -177,6 +178,7 @@ struct smb3_fs_context { 


	char *username;

	char *password;

	char *password2;

	char *domainname;

	char *source;

	char *server_hostname;