ksmbd: fix potential circular locking issue in smb2_set_ea()

[ Upstream commit 6fc0a265e1b932e5e97a038f99e29400a93baad0 ]

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: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index 297ed5c..8747fd3 100644 (file)
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -2323,11 +2323,12 @@ out:
  * @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;
@@ -3015,7 +3016,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:
        {