Commit 6fc0a265 authored by Namjae Jeon's avatar Namjae Jeon Committed by Steve French
Browse files

ksmbd: fix potential circular locking issue in smb2_set_ea() 



smb2_set_ea() can be called in parent inode lock range.
So add get_write argument to smb2_set_ea() not to call nested
mnt_want_write().

Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent bb05367a

fs/smb/server/smb2pdu.c

+4 −3
Original line number Diff line number Diff line
@@ -2311,11 +2311,12 @@ static noinline int create_smb2_pipe(struct ksmbd_work *work) 
 * @eabuf:	set info command buffer

 * @buf_len:	set info command buffer length

 * @path:	dentry path for get ea

 * @get_write:	get write access to a mount

 *

 * Return:	0 on success, otherwise error

 */

static int smb2_set_ea(struct smb2_ea_info *eabuf, unsigned int buf_len,

		       const struct path *path)

		       const struct path *path, bool get_write)

{

	struct mnt_idmap *idmap = mnt_idmap(path->mnt);

	char *attr_name = NULL, *value;
@@ -3003,7 +3004,7 @@ int smb2_open(struct ksmbd_work *work) 


			rc = smb2_set_ea(&ea_buf->ea,

					 le32_to_cpu(ea_buf->ccontext.DataLength),

					 &path);

					 &path, false);

			if (rc == -EOPNOTSUPP)

				rc = 0;

			else if (rc)
@@ -5992,7 +5993,7 @@ static int smb2_set_info_file(struct ksmbd_work *work, struct ksmbd_file *fp, 
			return -EINVAL;



		return smb2_set_ea((struct smb2_ea_info *)req->Buffer,

				   buf_len, &fp->filp->f_path);

				   buf_len, &fp->filp->f_path, true);

	}

	case FILE_POSITION_INFORMATION:

	{