[PATCH 6.1.y 23/73] ksmbd: add mnt_want_write to ksmbd vfs functions

31 Dec 2023

[ Upstream commit 40b268d384a22276dca1450549f53eed60e21deb ]
ksmbd is doing write access using vfs helpers. There are the cases that
mnt_want_write() is not called in vfs helper. This patch add missing
mnt_want_write() to ksmbd vfs functions.
Cc: stable@vger.kernel.org
Cc: Amir Goldstein amir73il@gmail.com
Signed-off-by: Namjae Jeon linkinjeon@kernel.org
Signed-off-by: Steve French stfrench@microsoft.com
---
 fs/smb/server/smb2pdu.c   |  26 ++++-----
 fs/smb/server/smbacl.c    |  10 ++--
 fs/smb/server/vfs.c       | 112 ++++++++++++++++++++++++++++++--------
 fs/smb/server/vfs.h       |  17 +++---
 fs/smb/server/vfs_cache.c |   2 +-
 5 files changed, 112 insertions(+), 55 deletions(-)

diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index 028b1d1055b5..f35e06ae25b3 100644
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -2295,7 +2295,7 @@ static int smb2_set_ea(struct smb2_ea_info *eabuf, unsigned int buf_len,
    		/* delete the EA only when it exits */
    		if (rc > 0) {
    			rc = ksmbd_vfs_remove_xattr(user_ns,
-							    path->dentry,
+							    path,
    						    attr_name);
if (rc < 0) {
@@ -2309,8 +2309,7 @@ static int smb2_set_ea(struct smb2_ea_info *eabuf, unsigned int buf_len,
    		/* if the EA doesn't exist, just do nothing. */
    		rc = 0;
    	} else {
-			rc = ksmbd_vfs_setxattr(user_ns,
-						path->dentry, attr_name, value,
+			rc = ksmbd_vfs_setxattr(user_ns, path, attr_name, value,
    					le16_to_cpu(eabuf->EaValueLength), 0);
    		if (rc < 0) {
    			ksmbd_debug(SMB,
@@ -2374,8 +2373,7 @@ static noinline int smb2_set_stream_name_xattr(const struct path *path,
    	return -EBADF;
    }
-	rc = ksmbd_vfs_setxattr(user_ns, path->dentry,
-				xattr_stream_name, NULL, 0, 0);
+	rc = ksmbd_vfs_setxattr(user_ns, path, xattr_stream_name, NULL, 0, 0);
    if (rc < 0)
    	pr_err("Failed to store XATTR stream name :%d\n", rc);
    return 0;
@@ -2403,7 +2401,7 @@ static int smb2_remove_smb_xattrs(const struct path *path)
    	if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN) &&
    	    !strncmp(&name[XATTR_USER_PREFIX_LEN], STREAM_PREFIX,
    		     STREAM_PREFIX_LEN)) {
-			err = ksmbd_vfs_remove_xattr(user_ns, path->dentry,
+			err = ksmbd_vfs_remove_xattr(user_ns, path,
    					     name);
    		if (err)
    			ksmbd_debug(SMB, "remove xattr failed : %s\n",
@@ -2450,8 +2448,7 @@ static void smb2_new_xattrs(struct ksmbd_tree_connect *tcon, const struct path *
    da.flags = XATTR_DOSINFO_ATTRIB | XATTR_DOSINFO_CREATE_TIME |
    	XATTR_DOSINFO_ITIME;
-	rc = ksmbd_vfs_set_dos_attrib_xattr(mnt_user_ns(path->mnt),
-					    path->dentry, &da);
+	rc = ksmbd_vfs_set_dos_attrib_xattr(mnt_user_ns(path->mnt), path, &da);
    if (rc)
    	ksmbd_debug(SMB, "failed to store file attribute into xattr\n");
 }
@@ -3025,7 +3022,7 @@ int smb2_open(struct ksmbd_work *work)
    	struct inode *inode = d_inode(path.dentry);
posix_acl_rc = ksmbd_vfs_inherit_posix_acl(user_ns,
-							   inode,
+							   &path,
    						   d_inode(path.dentry->d_parent));
    	if (posix_acl_rc)
    		ksmbd_debug(SMB, "inherit posix acl failed : %d\n", posix_acl_rc);
@@ -3041,7 +3038,7 @@ int smb2_open(struct ksmbd_work *work)
    		if (rc) {
    			if (posix_acl_rc)
    				ksmbd_vfs_set_init_posix_acl(user_ns,
-								     inode);
+								     &path);
if (test_share_config_flag(work->tcon->share_conf,
    						   KSMBD_SHARE_FLAG_ACL_XATTR)) {
@@ -3081,7 +3078,7 @@ int smb2_open(struct ksmbd_work *work)
rc = ksmbd_vfs_set_sd_xattr(conn,
    							    user_ns,
-								    path.dentry,
+								    &path,
    							    pntsd,
    							    pntsd_size);
    				kfree(pntsd);
@@ -5522,7 +5519,7 @@ static int smb2_rename(struct ksmbd_work *work,
    		goto out;
rc = ksmbd_vfs_setxattr(file_mnt_user_ns(fp->filp),
-					fp->filp->f_path.dentry,
+					&fp->filp->f_path,
    				xattr_stream_name,
    				NULL, 0, 0);
    	if (rc < 0) {
@@ -5687,8 +5684,7 @@ static int set_file_basic_info(struct ksmbd_file *fp,
    	da.flags = XATTR_DOSINFO_ATTRIB | XATTR_DOSINFO_CREATE_TIME |
    		XATTR_DOSINFO_ITIME;
-		rc = ksmbd_vfs_set_dos_attrib_xattr(user_ns,
-						    filp->f_path.dentry, &da);
+		rc = ksmbd_vfs_set_dos_attrib_xattr(user_ns, &filp->f_path, &da);
    	if (rc)
    		ksmbd_debug(SMB,
    			    "failed to restore file attribute in EA\n");
@@ -7558,7 +7554,7 @@ static inline int fsctl_set_sparse(struct ksmbd_work *work, u64 id,
da.attr = le32_to_cpu(fp->f_ci->m_fattr);
    	ret = ksmbd_vfs_set_dos_attrib_xattr(user_ns,
-						     fp->filp->f_path.dentry, &da);
+						     &fp->filp->f_path, &da);
    	if (ret)
    		fp->f_ci->m_fattr = old_fattr;
    }
diff --git a/fs/smb/server/smbacl.c b/fs/smb/server/smbacl.c
index 8c041e71cf15..8fe2592c5525 100644
--- a/fs/smb/server/smbacl.c
+++ b/fs/smb/server/smbacl.c
@@ -1185,8 +1185,7 @@ int smb_inherit_dacl(struct ksmbd_conn *conn,
    		pntsd_size += sizeof(struct smb_acl) + nt_size;
    	}
-		ksmbd_vfs_set_sd_xattr(conn, user_ns,
-				       path->dentry, pntsd, pntsd_size);
+		ksmbd_vfs_set_sd_xattr(conn, user_ns, path, pntsd, pntsd_size);
    	kfree(pntsd);
    }
@@ -1406,7 +1405,7 @@ int set_info_sec(struct ksmbd_conn *conn, struct ksmbd_tree_connect *tcon,
    newattrs.ia_valid |= ATTR_MODE;
    newattrs.ia_mode = (inode->i_mode & ~0777) | (fattr.cf_mode & 0777);
-	ksmbd_vfs_remove_acl_xattrs(user_ns, path->dentry);
+	ksmbd_vfs_remove_acl_xattrs(user_ns, path);
    /* Update posix acls */
    if (IS_ENABLED(CONFIG_FS_POSIX_ACL) && fattr.cf_dacls) {
    	rc = set_posix_acl(user_ns, inode,
@@ -1437,9 +1436,8 @@ int set_info_sec(struct ksmbd_conn *conn, struct ksmbd_tree_connect *tcon,
if (test_share_config_flag(tcon->share_conf, KSMBD_SHARE_FLAG_ACL_XATTR)) {
    	/* Update WinACL in xattr */
-		ksmbd_vfs_remove_sd_xattrs(user_ns, path->dentry);
-		ksmbd_vfs_set_sd_xattr(conn, user_ns,
-				       path->dentry, pntsd, ntsd_len);
+		ksmbd_vfs_remove_sd_xattrs(user_ns, path);
+		ksmbd_vfs_set_sd_xattr(conn, user_ns, path, pntsd, ntsd_len);
    }
out:
diff --git a/fs/smb/server/vfs.c b/fs/smb/server/vfs.c
index 6d171f2757f1..e6218c687fa0 100644
--- a/fs/smb/server/vfs.c
+++ b/fs/smb/server/vfs.c
@@ -171,6 +171,10 @@ int ksmbd_vfs_create(struct ksmbd_work *work, const char *name, umode_t mode)
    	return err;
    }
+	err = mnt_want_write(path.mnt);
+	if (err)
+		goto out_err;
+
    mode |= S_IFREG;
    err = vfs_create(mnt_user_ns(path.mnt), d_inode(path.dentry),
    		 dentry, mode, true);
@@ -180,6 +184,9 @@ int ksmbd_vfs_create(struct ksmbd_work *work, const char *name, umode_t mode)
    } else {
    	pr_err("File(%s): creation failed (err:%d)\n", name, err);
    }
+	mnt_drop_write(path.mnt);
+
+out_err:
    done_path_create(&path, dentry);
    return err;
 }
@@ -210,30 +217,35 @@ int ksmbd_vfs_mkdir(struct ksmbd_work *work, const char *name, umode_t mode)
    	return err;
    }
+	err = mnt_want_write(path.mnt);
+	if (err)
+		goto out_err2;
+
    user_ns = mnt_user_ns(path.mnt);
    mode |= S_IFDIR;
    err = vfs_mkdir(user_ns, d_inode(path.dentry), dentry, mode);
-	if (err) {
-		goto out;
-	} else if (d_unhashed(dentry)) {
+	if (!err && d_unhashed(dentry)) {
    	struct dentry *d;
d = lookup_one(user_ns, dentry->d_name.name, dentry->d_parent,
    		       dentry->d_name.len);
    	if (IS_ERR(d)) {
    		err = PTR_ERR(d);
-			goto out;
+			goto out_err1;
    	}
    	if (unlikely(d_is_negative(d))) {
    		dput(d);
    		err = -ENOENT;
-			goto out;
+			goto out_err1;
    	}
ksmbd_vfs_inherit_owner(work, d_inode(path.dentry), d_inode(d));
    	dput(d);
    }
-out:
+
+out_err1:
+	mnt_drop_write(path.mnt);
+out_err2:
    done_path_create(&path, dentry);
    if (err)
    	pr_err("mkdir(%s): creation failed (err:%d)\n", name, err);
@@ -444,7 +456,7 @@ static int ksmbd_vfs_stream_write(struct ksmbd_file *fp, char *buf, loff_t *pos,
    memcpy(&stream_buf[*pos], buf, count);
err = ksmbd_vfs_setxattr(user_ns,
-				 fp->filp->f_path.dentry,
+				 &fp->filp->f_path,
    			 fp->stream.name,
    			 (void *)stream_buf,
    			 size,
@@ -590,6 +602,10 @@ int ksmbd_vfs_remove_file(struct ksmbd_work *work, const struct path *path)
    	goto out_err;
    }
+	err = mnt_want_write(path->mnt);
+	if (err)
+		goto out_err;
+
    user_ns = mnt_user_ns(path->mnt);
    if (S_ISDIR(d_inode(path->dentry)->i_mode)) {
    	err = vfs_rmdir(user_ns, d_inode(parent), path->dentry);
@@ -600,6 +616,7 @@ int ksmbd_vfs_remove_file(struct ksmbd_work *work, const struct path *path)
    	if (err)
    		ksmbd_debug(VFS, "unlink failed, err %d\n", err);
    }
+	mnt_drop_write(path->mnt);
out_err:
    ksmbd_revert_fsids(work);
@@ -645,11 +662,16 @@ int ksmbd_vfs_link(struct ksmbd_work *work, const char *oldname,
    	goto out3;
    }
+	err = mnt_want_write(newpath.mnt);
+	if (err)
+		goto out3;
+
    err = vfs_link(oldpath.dentry, mnt_user_ns(newpath.mnt),
    	       d_inode(newpath.dentry),
    	       dentry, NULL);
    if (err)
    	ksmbd_debug(VFS, "vfs_link failed err %d\n", err);
+	mnt_drop_write(newpath.mnt);
out3:
    done_path_create(&newpath, dentry);
@@ -695,6 +717,10 @@ int ksmbd_vfs_rename(struct ksmbd_work *work, const struct path *old_path,
    	goto out2;
    }
+	err = mnt_want_write(old_path->mnt);
+	if (err)
+		goto out2;
+
    trap = lock_rename_child(old_child, new_path.dentry);
old_parent = dget(old_child->d_parent);
@@ -758,6 +784,7 @@ int ksmbd_vfs_rename(struct ksmbd_work *work, const struct path *old_path,
 out3:
    dput(old_parent);
    unlock_rename(old_parent, new_path.dentry);
+	mnt_drop_write(old_path->mnt);
 out2:
    path_put(&new_path);
@@ -898,19 +925,24 @@ ssize_t ksmbd_vfs_getxattr(struct user_namespace *user_ns,
  * Return:	0 on success, otherwise error
  */
 int ksmbd_vfs_setxattr(struct user_namespace *user_ns,
-		       struct dentry *dentry, const char *attr_name,
+		       const struct path *path, const char *attr_name,
    	       void *attr_value, size_t attr_size, int flags)
 {
    int err;
+	err = mnt_want_write(path->mnt);
+	if (err)
+		return err;
+
    err = vfs_setxattr(user_ns,
-			   dentry,
+			   path->dentry,
    		   attr_name,
    		   attr_value,
    		   attr_size,
    		   flags);
    if (err)
    	ksmbd_debug(VFS, "setxattr failed, err %d\n", err);
+	mnt_drop_write(path->mnt);
    return err;
 }
@@ -1014,9 +1046,18 @@ int ksmbd_vfs_fqar_lseek(struct ksmbd_file *fp, loff_t start, loff_t length,
 }
int ksmbd_vfs_remove_xattr(struct user_namespace *user_ns,
-			   struct dentry *dentry, char *attr_name)
+			   const struct path *path, char *attr_name)
 {
-	return vfs_removexattr(user_ns, dentry, attr_name);
+	int err;
+
+	err = mnt_want_write(path->mnt);
+	if (err)
+		return err;
+
+	err = vfs_removexattr(user_ns, path->dentry, attr_name);
+	mnt_drop_write(path->mnt);
+
+	return err;
 }
int ksmbd_vfs_unlink(struct file *filp)
@@ -1025,6 +1066,10 @@ int ksmbd_vfs_unlink(struct file *filp)
    struct dentry *dir, *dentry = filp->f_path.dentry;
    struct user_namespace *user_ns = file_mnt_user_ns(filp);
+	err = mnt_want_write(filp->f_path.mnt);
+	if (err)
+		return err;
+
    dir = dget_parent(dentry);
    err = ksmbd_vfs_lock_parent(dir, dentry);
    if (err)
@@ -1042,6 +1087,7 @@ int ksmbd_vfs_unlink(struct file *filp)
    	ksmbd_debug(VFS, "failed to delete, err %d\n", err);
 out:
    dput(dir);
+	mnt_drop_write(filp->f_path.mnt);
return err;
 }
@@ -1245,13 +1291,13 @@ struct dentry *ksmbd_vfs_kern_path_create(struct ksmbd_work *work,
 }
int ksmbd_vfs_remove_acl_xattrs(struct user_namespace *user_ns,
-				struct dentry *dentry)
+				const struct path *path)
 {
    char *name, *xattr_list = NULL;
    ssize_t xattr_list_len;
    int err = 0;
-	xattr_list_len = ksmbd_vfs_listxattr(dentry, &xattr_list);
+	xattr_list_len = ksmbd_vfs_listxattr(path->dentry, &xattr_list);
    if (xattr_list_len < 0) {
    	goto out;
    } else if (!xattr_list_len) {
@@ -1267,25 +1313,25 @@ int ksmbd_vfs_remove_acl_xattrs(struct user_namespace *user_ns,
    		     sizeof(XATTR_NAME_POSIX_ACL_ACCESS) - 1) ||
    	    !strncmp(name, XATTR_NAME_POSIX_ACL_DEFAULT,
    		     sizeof(XATTR_NAME_POSIX_ACL_DEFAULT) - 1)) {
-			err = ksmbd_vfs_remove_xattr(user_ns, dentry, name);
+			err = ksmbd_vfs_remove_xattr(user_ns, path, name);
    		if (err)
    			ksmbd_debug(SMB,
    				    "remove acl xattr failed : %s\n", name);
    	}
    }
+
 out:
    kvfree(xattr_list);
    return err;
 }
-int ksmbd_vfs_remove_sd_xattrs(struct user_namespace *user_ns,
-			       struct dentry *dentry)
+int ksmbd_vfs_remove_sd_xattrs(struct user_namespace *user_ns, const struct path *path)
 {
    char *name, *xattr_list = NULL;
    ssize_t xattr_list_len;
    int err = 0;
-	xattr_list_len = ksmbd_vfs_listxattr(dentry, &xattr_list);
+	xattr_list_len = ksmbd_vfs_listxattr(path->dentry, &xattr_list);
    if (xattr_list_len < 0) {
    	goto out;
    } else if (!xattr_list_len) {
@@ -1298,7 +1344,7 @@ int ksmbd_vfs_remove_sd_xattrs(struct user_namespace *user_ns,
    	ksmbd_debug(SMB, "%s, len %zd\n", name, strlen(name));
if (!strncmp(name, XATTR_NAME_SD, XATTR_NAME_SD_LEN)) {
-			err = ksmbd_vfs_remove_xattr(user_ns, dentry, name);
+			err = ksmbd_vfs_remove_xattr(user_ns, path, name);
    		if (err)
    			ksmbd_debug(SMB, "remove xattr failed : %s\n", name);
    	}
@@ -1375,13 +1421,14 @@ static struct xattr_smb_acl *ksmbd_vfs_make_xattr_posix_acl(struct user_namespac
int ksmbd_vfs_set_sd_xattr(struct ksmbd_conn *conn,
    		   struct user_namespace *user_ns,
-			   struct dentry *dentry,
+			   const struct path *path,
    		   struct smb_ntsd *pntsd, int len)
 {
    int rc;
    struct ndr sd_ndr = {0}, acl_ndr = {0};
    struct xattr_ntacl acl = {0};
    struct xattr_smb_acl *smb_acl, *def_smb_acl = NULL;
+	struct dentry *dentry = path->dentry;
    struct inode *inode = d_inode(dentry);
acl.version = 4;
@@ -1433,7 +1480,7 @@ int ksmbd_vfs_set_sd_xattr(struct ksmbd_conn *conn,
    	goto out;
    }
-	rc = ksmbd_vfs_setxattr(user_ns, dentry,
+	rc = ksmbd_vfs_setxattr(user_ns, path,
    			XATTR_NAME_SD, sd_ndr.data,
    			sd_ndr.offset, 0);
    if (rc < 0)
@@ -1523,7 +1570,7 @@ int ksmbd_vfs_get_sd_xattr(struct ksmbd_conn *conn,
 }
int ksmbd_vfs_set_dos_attrib_xattr(struct user_namespace *user_ns,
-				   struct dentry *dentry,
+				   const struct path *path,
    			   struct xattr_dos_attrib *da)
 {
    struct ndr n;
@@ -1533,7 +1580,7 @@ int ksmbd_vfs_set_dos_attrib_xattr(struct user_namespace *user_ns,
    if (err)
    	return err;
-	err = ksmbd_vfs_setxattr(user_ns, dentry, XATTR_NAME_DOS_ATTRIBUTE,
+	err = ksmbd_vfs_setxattr(user_ns, path, XATTR_NAME_DOS_ATTRIBUTE,
    			 (void *)n.data, n.offset, 0);
    if (err)
    	ksmbd_debug(SMB, "failed to store dos attribute in xattr\n");
@@ -1770,10 +1817,11 @@ void ksmbd_vfs_posix_lock_unblock(struct file_lock *flock)
 }
int ksmbd_vfs_set_init_posix_acl(struct user_namespace *user_ns,
-				 struct inode *inode)
+				 struct path *path)
 {
    struct posix_acl_state acl_state;
    struct posix_acl *acls;
+	struct inode *inode = d_inode(path->dentry);
    int rc;
if (!IS_ENABLED(CONFIG_FS_POSIX_ACL))
@@ -1802,6 +1850,11 @@ int ksmbd_vfs_set_init_posix_acl(struct user_namespace *user_ns,
    	return -ENOMEM;
    }
    posix_state_to_acl(&acl_state, acls->a_entries);
+
+	rc = mnt_want_write(path->mnt);
+	if (rc)
+		goto out_err;
+
    rc = set_posix_acl(user_ns, inode, ACL_TYPE_ACCESS, acls);
    if (rc < 0)
    	ksmbd_debug(SMB, "Set posix acl(ACL_TYPE_ACCESS) failed, rc : %d\n",
@@ -1814,16 +1867,20 @@ int ksmbd_vfs_set_init_posix_acl(struct user_namespace *user_ns,
    		ksmbd_debug(SMB, "Set posix acl(ACL_TYPE_DEFAULT) failed, rc : %d\n",
    			    rc);
    }
+	mnt_drop_write(path->mnt);
+
+out_err:
    free_acl_state(&acl_state);
    posix_acl_release(acls);
    return rc;
 }
int ksmbd_vfs_inherit_posix_acl(struct user_namespace *user_ns,
-				struct inode *inode, struct inode *parent_inode)
+				struct path *path, struct inode *parent_inode)
 {
    struct posix_acl *acls;
    struct posix_acl_entry *pace;
+	struct inode *inode = d_inode(path->dentry);
    int rc, i;
if (!IS_ENABLED(CONFIG_FS_POSIX_ACL))
@@ -1841,6 +1898,10 @@ int ksmbd_vfs_inherit_posix_acl(struct user_namespace *user_ns,
    	}
    }
+	rc = mnt_want_write(path->mnt);
+	if (rc)
+		goto out_err;
+
    rc = set_posix_acl(user_ns, inode, ACL_TYPE_ACCESS, acls);
    if (rc < 0)
    	ksmbd_debug(SMB, "Set posix acl(ACL_TYPE_ACCESS) failed, rc : %d\n",
@@ -1852,6 +1913,9 @@ int ksmbd_vfs_inherit_posix_acl(struct user_namespace *user_ns,
    		ksmbd_debug(SMB, "Set posix acl(ACL_TYPE_DEFAULT) failed, rc : %d\n",
    			    rc);
    }
+	mnt_drop_write(path->mnt);
+
+out_err:
    posix_acl_release(acls);
    return rc;
 }
diff --git a/fs/smb/server/vfs.h b/fs/smb/server/vfs.h
index 7660565ac277..0a4eb1e1a79a 100644
--- a/fs/smb/server/vfs.h
+++ b/fs/smb/server/vfs.h
@@ -108,12 +108,12 @@ ssize_t ksmbd_vfs_casexattr_len(struct user_namespace *user_ns,
    			struct dentry *dentry, char *attr_name,
    			int attr_name_len);
 int ksmbd_vfs_setxattr(struct user_namespace *user_ns,
-		       struct dentry *dentry, const char *attr_name,
+		       const struct path *path, const char *attr_name,
    	       void *attr_value, size_t attr_size, int flags);
 int ksmbd_vfs_xattr_stream_name(char *stream_name, char **xattr_stream_name,
    			size_t *xattr_stream_name_size, int s_type);
 int ksmbd_vfs_remove_xattr(struct user_namespace *user_ns,
-			   struct dentry *dentry, char *attr_name);
+			   const struct path *path, char *attr_name);
 int ksmbd_vfs_kern_path_locked(struct ksmbd_work *work, char *name,
    		       unsigned int flags, struct path *path,
    		       bool caseless);
@@ -139,26 +139,25 @@ void ksmbd_vfs_posix_lock_wait(struct file_lock *flock);
 int ksmbd_vfs_posix_lock_wait_timeout(struct file_lock *flock, long timeout);
 void ksmbd_vfs_posix_lock_unblock(struct file_lock *flock);
 int ksmbd_vfs_remove_acl_xattrs(struct user_namespace *user_ns,
-				struct dentry *dentry);
-int ksmbd_vfs_remove_sd_xattrs(struct user_namespace *user_ns,
-			       struct dentry *dentry);
+				const struct path *path);
+int ksmbd_vfs_remove_sd_xattrs(struct user_namespace *user_ns, const struct path *path);
 int ksmbd_vfs_set_sd_xattr(struct ksmbd_conn *conn,
    		   struct user_namespace *user_ns,
-			   struct dentry *dentry,
+			   const struct path *path,
    		   struct smb_ntsd *pntsd, int len);
 int ksmbd_vfs_get_sd_xattr(struct ksmbd_conn *conn,
    		   struct user_namespace *user_ns,
    		   struct dentry *dentry,
    		   struct smb_ntsd **pntsd);
 int ksmbd_vfs_set_dos_attrib_xattr(struct user_namespace *user_ns,
-				   struct dentry *dentry,
+				   const struct path *path,
    			   struct xattr_dos_attrib *da);
 int ksmbd_vfs_get_dos_attrib_xattr(struct user_namespace *user_ns,
    			   struct dentry *dentry,
    			   struct xattr_dos_attrib *da);
 int ksmbd_vfs_set_init_posix_acl(struct user_namespace *user_ns,
-				 struct inode *inode);
+				 struct path *path);
 int ksmbd_vfs_inherit_posix_acl(struct user_namespace *user_ns,
-				struct inode *inode,
+				struct path *path,
    			struct inode *parent_inode);
 #endif /* __KSMBD_VFS_H__ */
diff --git a/fs/smb/server/vfs_cache.c b/fs/smb/server/vfs_cache.c
index bafb34d4b5bb..94ad8fa07b46 100644
--- a/fs/smb/server/vfs_cache.c
+++ b/fs/smb/server/vfs_cache.c
@@ -251,7 +251,7 @@ static void __ksmbd_inode_close(struct ksmbd_file *fp)
    if (ksmbd_stream_fd(fp) && (ci->m_flags & S_DEL_ON_CLS_STREAM)) {
    	ci->m_flags &= ~S_DEL_ON_CLS_STREAM;
    	err = ksmbd_vfs_remove_xattr(file_mnt_user_ns(filp),
-					     filp->f_path.dentry,
+					     &filp->f_path,
    				     fp->stream.name);
    	if (err)
    		pr_err("remove xattr failed : %s\n",
-- 
2.25.1



    

2024

2023

2022

2021

2020

2019

2018

2017

[PATCH 6.1.y 23/73] ksmbd: add mnt_want_write to ksmbd vfs functions