[PATCH 160/308] ksmbd: adapt vfs api to 5.10

16 Nov 2022

From: Jason Yan yanaijie@huawei.com
hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I60T7G
CVE: NA
-------------------------------
These vfs apis have not supported user namespace in 5.10, so we need to
adapt these apis to remove all user namespace parameters.
Signed-off-by: Jason Yan yanaijie@huawei.com
Signed-off-by: Zhong Jinghua zhongjinghua@huawei.com
---
 fs/ksmbd/smb2pdu.c | 31 +++++++++++++-------------
 fs/ksmbd/smbacl.c  |  4 ++--
 fs/ksmbd/vfs.c     | 54 +++++++++++++++++++++-------------------------
 3 files changed, 41 insertions(+), 48 deletions(-)

diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index d79ea3eb57a7..dedd00379fde 100644
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -2634,7 +2634,7 @@ int smb2_open(struct ksmbd_work *work)
    	rc = 0;
    } else {
    	file_present = true;
-		generic_fillattr(&init_user_ns, d_inode(path.dentry), &stat);
+		generic_fillattr(d_inode(path.dentry), &stat);
    }
    if (stream_name) {
    	if (req->CreateOptions & FILE_DIRECTORY_FILE_LE) {
@@ -2738,8 +2738,7 @@ int smb2_open(struct ksmbd_work *work)
    	 * is already granted.
    	 */
    	if (daccess & ~(FILE_READ_ATTRIBUTES_LE | FILE_READ_CONTROL_LE)) {
-			rc = inode_permission(&init_user_ns,
-					      d_inode(path.dentry),
+			rc = inode_permission(d_inode(path.dentry),
    				      may_flags);
    		if (rc)
    			goto err_out;
@@ -2895,7 +2894,7 @@ int smb2_open(struct ksmbd_work *work)
rc = ksmbd_vfs_getattr(&path, &stat);
    if (rc) {
-		generic_fillattr(&init_user_ns, d_inode(path.dentry), &stat);
+		generic_fillattr(d_inode(path.dentry), &stat);
    	rc = 0;
    }
@@ -2996,7 +2995,7 @@ int smb2_open(struct ksmbd_work *work)
memcpy(fp->client_guid, conn->ClientGUID, SMB2_CLIENT_GUID_SIZE);
-	generic_fillattr(&init_user_ns, file_inode(fp->filp), &stat);
+	generic_fillattr(file_inode(fp->filp), &stat);
rsp->StructureSize = cpu_to_le16(89);
    rcu_read_lock();
@@ -3710,7 +3709,7 @@ int smb2_query_dir(struct ksmbd_work *work)
    }
if (!(dir_fp->daccess & FILE_LIST_DIRECTORY_LE) ||
-	    inode_permission(&init_user_ns, file_inode(dir_fp->filp),
+	    inode_permission(file_inode(dir_fp->filp),
    		     MAY_READ | MAY_EXEC)) {
    	pr_err("no right to enumerate directory (%pd)\n",
    	       dir_fp->filp->f_path.dentry);
@@ -4124,7 +4123,7 @@ static int get_file_basic_info(struct smb2_query_info_rsp *rsp,
    }
basic_info = (struct smb2_file_all_info *)rsp->Buffer;
-	generic_fillattr(&init_user_ns, file_inode(fp->filp), &stat);
+	generic_fillattr(file_inode(fp->filp), &stat);
    basic_info->CreationTime = cpu_to_le64(fp->create_time);
    time = ksmbd_UnixTimeToNT(stat.atime);
    basic_info->LastAccessTime = cpu_to_le64(time);
@@ -4165,7 +4164,7 @@ static void get_file_standard_info(struct smb2_query_info_rsp *rsp,
    struct kstat stat;
inode = file_inode(fp->filp);
-	generic_fillattr(&init_user_ns, inode, &stat);
+	generic_fillattr(inode, &stat);
sinfo = (struct smb2_file_standard_info *)rsp->Buffer;
    delete_pending = ksmbd_inode_pending_delete(fp);
@@ -4220,7 +4219,7 @@ static int get_file_all_info(struct ksmbd_work *work,
    	return -ENOMEM;
inode = file_inode(fp->filp);
-	generic_fillattr(&init_user_ns, inode, &stat);
+	generic_fillattr(inode, &stat);
ksmbd_debug(SMB, "filename = %s\n", filename);
    delete_pending = ksmbd_inode_pending_delete(fp);
@@ -4295,7 +4294,7 @@ static void get_file_stream_info(struct ksmbd_work *work,
    ssize_t xattr_list_len;
    int nbytes = 0, streamlen, stream_name_len, next, idx = 0;
-	generic_fillattr(&init_user_ns, file_inode(fp->filp), &stat);
+	generic_fillattr(file_inode(fp->filp), &stat);
    file_info = (struct smb2_file_stream_info *)rsp->Buffer;
xattr_list_len = ksmbd_vfs_listxattr(path->dentry, &xattr_list);
@@ -4374,7 +4373,7 @@ static void get_file_internal_info(struct smb2_query_info_rsp *rsp,
    struct smb2_file_internal_info *file_info;
    struct kstat stat;
-	generic_fillattr(&init_user_ns, file_inode(fp->filp), &stat);
+	generic_fillattr(file_inode(fp->filp), &stat);
    file_info = (struct smb2_file_internal_info *)rsp->Buffer;
    file_info->IndexNumber = cpu_to_le64(stat.ino);
    rsp->OutputBufferLength =
@@ -4399,7 +4398,7 @@ static int get_file_network_open_info(struct smb2_query_info_rsp *rsp,
    file_info = (struct smb2_file_ntwrk_info *)rsp->Buffer;
inode = file_inode(fp->filp);
-	generic_fillattr(&init_user_ns, inode, &stat);
+	generic_fillattr(inode, &stat);
file_info->CreationTime = cpu_to_le64(fp->create_time);
    time = ksmbd_UnixTimeToNT(stat.atime);
@@ -4460,7 +4459,7 @@ static void get_file_compression_info(struct smb2_query_info_rsp *rsp,
    struct smb2_file_comp_info *file_info;
    struct kstat stat;
-	generic_fillattr(&init_user_ns, file_inode(fp->filp), &stat);
+	generic_fillattr(file_inode(fp->filp), &stat);
file_info = (struct smb2_file_comp_info *)rsp->Buffer;
    file_info->CompressedFileSize = cpu_to_le64(stat.blocks << 9);
@@ -5433,14 +5432,14 @@ static int set_file_basic_info(struct ksmbd_file *fp, char *buf,
    	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
    		return -EACCES;
-		rc = setattr_prepare(&init_user_ns, dentry, &attrs);
+		rc = setattr_prepare(dentry, &attrs);
    	if (rc)
    		return -EINVAL;
inode_lock(inode);
-		setattr_copy(&init_user_ns, inode, &attrs);
+		setattr_copy(inode, &attrs);
    	attrs.ia_valid &= ~ATTR_CTIME;
-		rc = notify_change(&init_user_ns, dentry, &attrs, NULL);
+		rc = notify_change(dentry, &attrs, NULL);
    	inode_unlock(inode);
    }
    return 0;
diff --git a/fs/ksmbd/smbacl.c b/fs/ksmbd/smbacl.c
index e0825d3771a1..b1e9473a732a 100644
--- a/fs/ksmbd/smbacl.c
+++ b/fs/ksmbd/smbacl.c
@@ -1287,10 +1287,10 @@ int set_info_sec(struct ksmbd_conn *conn, struct ksmbd_tree_connect *tcon,
    ksmbd_vfs_remove_acl_xattrs(path->dentry);
    /* Update posix acls */
    if (fattr.cf_dacls) {
-		rc = set_posix_acl(&init_user_ns, inode, ACL_TYPE_ACCESS,
+		rc = set_posix_acl(inode, ACL_TYPE_ACCESS,
    			   fattr.cf_acls);
    	if (S_ISDIR(inode->i_mode) && fattr.cf_dacls)
-			rc = set_posix_acl(&init_user_ns, inode,
+			rc = set_posix_acl(inode,
    				   ACL_TYPE_DEFAULT, fattr.cf_dacls);
    }
diff --git a/fs/ksmbd/vfs.c b/fs/ksmbd/vfs.c
index 702166266f91..63aea927d71e 100644
--- a/fs/ksmbd/vfs.c
+++ b/fs/ksmbd/vfs.c
@@ -107,7 +107,7 @@ int ksmbd_vfs_may_delete(struct dentry *dentry)
    	return ret;
    }
-	ret = inode_permission(&init_user_ns, d_inode(parent),
+	ret = inode_permission(d_inode(parent),
    		       MAY_EXEC | MAY_WRITE);
inode_unlock(d_inode(parent));
@@ -122,16 +122,16 @@ int ksmbd_vfs_query_maximal_access(struct dentry *dentry, __le32 *daccess)
*daccess = cpu_to_le32(FILE_READ_ATTRIBUTES | READ_CONTROL);
-	if (!inode_permission(&init_user_ns, d_inode(dentry), MAY_OPEN | MAY_WRITE))
+	if (!inode_permission(d_inode(dentry), MAY_OPEN | MAY_WRITE))
    	*daccess |= cpu_to_le32(WRITE_DAC | WRITE_OWNER | SYNCHRONIZE |
    			FILE_WRITE_DATA | FILE_APPEND_DATA |
    			FILE_WRITE_EA | FILE_WRITE_ATTRIBUTES |
    			FILE_DELETE_CHILD);
-	if (!inode_permission(&init_user_ns, d_inode(dentry), MAY_OPEN | MAY_READ))
+	if (!inode_permission(d_inode(dentry), MAY_OPEN | MAY_READ))
    	*daccess |= FILE_READ_DATA_LE | FILE_READ_EA_LE;
-	if (!inode_permission(&init_user_ns, d_inode(dentry), MAY_OPEN | MAY_EXEC))
+	if (!inode_permission(d_inode(dentry), MAY_OPEN | MAY_EXEC))
    	*daccess |= FILE_EXECUTE_LE;
parent = dget_parent(dentry);
@@ -141,7 +141,7 @@ int ksmbd_vfs_query_maximal_access(struct dentry *dentry, __le32 *daccess)
    	return ret;
    }
-	if (!inode_permission(&init_user_ns, d_inode(parent), MAY_EXEC | MAY_WRITE))
+	if (!inode_permission(d_inode(parent), MAY_EXEC | MAY_WRITE))
    	*daccess |= FILE_DELETE_LE;
inode_unlock(d_inode(parent));
@@ -173,7 +173,7 @@ int ksmbd_vfs_create(struct ksmbd_work *work, const char *name, umode_t mode)
    }
mode |= S_IFREG;
-	err = vfs_create(&init_user_ns, d_inode(path.dentry), dentry, mode, true);
+	err = vfs_create(d_inode(path.dentry), dentry, mode, true);
    if (!err) {
    	ksmbd_vfs_inherit_owner(work, d_inode(path.dentry),
    				d_inode(dentry));
@@ -208,7 +208,7 @@ int ksmbd_vfs_mkdir(struct ksmbd_work *work, const char *name, umode_t mode)
    }
mode |= S_IFDIR;
-	err = vfs_mkdir(&init_user_ns, d_inode(path.dentry), dentry, mode);
+	err = vfs_mkdir(d_inode(path.dentry), dentry, mode);
    if (err) {
    	goto out;
    } else if (d_unhashed(dentry)) {
@@ -606,12 +606,12 @@ int ksmbd_vfs_remove_file(struct ksmbd_work *work, char *name)
    }
if (S_ISDIR(d_inode(path.dentry)->i_mode)) {
-		err = vfs_rmdir(&init_user_ns, d_inode(parent), path.dentry);
+		err = vfs_rmdir(d_inode(parent), path.dentry);
    	if (err && err != -ENOTEMPTY)
    		ksmbd_debug(VFS, "%s: rmdir failed, err %d\n", name,
    			    err);
    } else {
-		err = vfs_unlink(&init_user_ns, d_inode(parent), path.dentry,
+		err = vfs_unlink(d_inode(parent), path.dentry,
    			 NULL);
    	if (err)
    		ksmbd_debug(VFS, "%s: unlink failed, err %d\n", name,
@@ -669,7 +669,7 @@ int ksmbd_vfs_link(struct ksmbd_work *work, const char *oldname,
    	goto out3;
    }
-	err = vfs_link(oldpath.dentry, &init_user_ns, d_inode(newpath.dentry),
+	err = vfs_link(oldpath.dentry, d_inode(newpath.dentry),
    	       dentry, NULL);
    if (err)
    	ksmbd_debug(VFS, "vfs_link failed err %d\n", err);
@@ -743,15 +743,9 @@ static int __ksmbd_vfs_rename(struct ksmbd_work *work,
err = -ENOTEMPTY;
    if (dst_dent != trap_dent && !d_really_is_positive(dst_dent)) {
-		struct renamedata rd = {
-			.old_mnt_userns	= &init_user_ns,
-			.old_dir	= d_inode(src_dent_parent),
-			.old_dentry	= src_dent,
-			.new_mnt_userns	= &init_user_ns,
-			.new_dir	= d_inode(dst_dent_parent),
-			.new_dentry	= dst_dent,
-		};
-		err = vfs_rename(&rd);
+		err = vfs_rename(d_inode(src_dent_parent), src_dent,
+				 d_inode(dst_dent_parent), dst_dent,
+				 NULL, 0);
    }
    if (err)
    	pr_err("vfs_rename failed err %d\n", err);
@@ -919,7 +913,7 @@ ssize_t ksmbd_vfs_listxattr(struct dentry *dentry, char **list)
static ssize_t ksmbd_vfs_xattr_len(struct dentry *dentry, char *xattr_name)
 {
-	return vfs_getxattr(&init_user_ns, dentry, xattr_name, NULL, 0);
+	return vfs_getxattr(dentry, xattr_name, NULL, 0);
 }
/**
@@ -945,7 +939,7 @@ ssize_t ksmbd_vfs_getxattr(struct dentry *dentry, char *xattr_name,
    if (!buf)
    	return -ENOMEM;
-	xattr_len = vfs_getxattr(&init_user_ns, dentry, xattr_name,
+	xattr_len = vfs_getxattr(dentry, xattr_name,
    			 (void *)buf, xattr_len);
    if (xattr_len > 0)
    	*xattr_buf = buf;
@@ -969,7 +963,7 @@ int ksmbd_vfs_setxattr(struct dentry *dentry, const char *attr_name,
 {
    int err;
-	err = vfs_setxattr(&init_user_ns, dentry,
+	err = vfs_setxattr(dentry,
    		   attr_name,
    		   attr_value,
    		   attr_size,
@@ -1078,7 +1072,7 @@ int ksmbd_vfs_fqar_lseek(struct ksmbd_file *fp, loff_t start, loff_t length,
int ksmbd_vfs_remove_xattr(struct dentry *dentry, char *attr_name)
 {
-	return vfs_removexattr(&init_user_ns, dentry, attr_name);
+	return vfs_removexattr(dentry, attr_name);
 }
int ksmbd_vfs_unlink(struct dentry *dir, struct dentry *dentry)
@@ -1091,9 +1085,9 @@ int ksmbd_vfs_unlink(struct dentry *dir, struct dentry *dentry)
    dget(dentry);
if (S_ISDIR(d_inode(dentry)->i_mode))
-		err = vfs_rmdir(&init_user_ns, d_inode(dir), dentry);
+		err = vfs_rmdir(d_inode(dir), dentry);
    else
-		err = vfs_unlink(&init_user_ns, d_inode(dir), dentry, NULL);
+		err = vfs_unlink(d_inode(dir), dentry, NULL);
dput(dentry);
    inode_unlock(d_inode(dir));
@@ -1599,7 +1593,7 @@ int ksmbd_vfs_fill_dentry_attrs(struct ksmbd_work *work, struct dentry *dentry,
    u64 time;
    int rc;
-	generic_fillattr(&init_user_ns, d_inode(dentry), ksmbd_kstat->kstat);
+	generic_fillattr(d_inode(dentry), ksmbd_kstat->kstat);
time = ksmbd_UnixTimeToNT(ksmbd_kstat->kstat->ctime);
    ksmbd_kstat->create_time = time;
@@ -1804,13 +1798,13 @@ int ksmbd_vfs_set_init_posix_acl(struct inode *inode)
    	return -ENOMEM;
    }
    posix_state_to_acl(&acl_state, acls->a_entries);
-	rc = set_posix_acl(&init_user_ns, inode, ACL_TYPE_ACCESS, acls);
+	rc = set_posix_acl(inode, ACL_TYPE_ACCESS, acls);
    if (rc < 0)
    	ksmbd_debug(SMB, "Set posix acl(ACL_TYPE_ACCESS) failed, rc : %d\n",
    		    rc);
    else if (S_ISDIR(inode->i_mode)) {
    	posix_state_to_acl(&acl_state, acls->a_entries);
-		rc = set_posix_acl(&init_user_ns, inode, ACL_TYPE_DEFAULT,
+		rc = set_posix_acl(inode, ACL_TYPE_DEFAULT,
    			   acls);
    	if (rc < 0)
    		ksmbd_debug(SMB, "Set posix acl(ACL_TYPE_DEFAULT) failed, rc : %d\n",
@@ -1839,12 +1833,12 @@ int ksmbd_vfs_inherit_posix_acl(struct inode *inode, struct inode *parent_inode)
    	}
    }
-	rc = set_posix_acl(&init_user_ns, inode, ACL_TYPE_ACCESS, acls);
+	rc = set_posix_acl(inode, ACL_TYPE_ACCESS, acls);
    if (rc < 0)
    	ksmbd_debug(SMB, "Set posix acl(ACL_TYPE_ACCESS) failed, rc : %d\n",
    		    rc);
    if (S_ISDIR(inode->i_mode)) {
-		rc = set_posix_acl(&init_user_ns, inode, ACL_TYPE_DEFAULT,
+		rc = set_posix_acl(inode, ACL_TYPE_DEFAULT,
    			   acls);
    	if (rc < 0)
    		ksmbd_debug(SMB, "Set posix acl(ACL_TYPE_DEFAULT) failed, rc : %d\n",
-- 
2.31.1

    

2024

2023

2022

2021

2020

2019

[PATCH 160/308] ksmbd: adapt vfs api to 5.10