Commit 62e1f3b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '6.10-rc3-smb3-server-fixes' of git://git.samba.org/ksmbd 

Pull smb server fixes from Steve French:
 "Two small smb3 server fixes:

   - set xatttr fix

   - pathname parsing check fix"

* tag '6.10-rc3-smb3-server-fixes' of git://git.samba.org/ksmbd:
  ksmbd: fix missing use of get_write in in smb2_set_ea()
  ksmbd: move leading slash check to smb2_get_name()
parents 08a6b55a 2bfc4214

fs/smb/server/smb2pdu.c

+10 −12
Original line number Diff line number Diff line
@@ -630,6 +630,12 @@ smb2_get_name(const char *src, const int maxlen, struct nls_table *local_nls) 
		return name;

	}



	if (*name == '\\') {

		pr_err("not allow directory name included leading slash\n");

		kfree(name);

		return ERR_PTR(-EINVAL);

	}



	ksmbd_conv_path_to_unix(name);

	ksmbd_strip_last_slash(name);

	return name;
@@ -2361,7 +2367,8 @@ static int smb2_set_ea(struct smb2_ea_info *eabuf, unsigned int buf_len, 
			if (rc > 0) {

				rc = ksmbd_vfs_remove_xattr(idmap,

							    path,

							    attr_name);

							    attr_name,

							    get_write);



				if (rc < 0) {

					ksmbd_debug(SMB,
@@ -2376,7 +2383,7 @@ static int smb2_set_ea(struct smb2_ea_info *eabuf, unsigned int buf_len, 
		} else {

			rc = ksmbd_vfs_setxattr(idmap, path, attr_name, value,

						le16_to_cpu(eabuf->EaValueLength),

						0, true);

						0, get_write);

			if (rc < 0) {

				ksmbd_debug(SMB,

					    "ksmbd_vfs_setxattr is failed(%d)\n",
@@ -2468,7 +2475,7 @@ static int smb2_remove_smb_xattrs(const struct path *path) 
		    !strncmp(&name[XATTR_USER_PREFIX_LEN], STREAM_PREFIX,

			     STREAM_PREFIX_LEN)) {

			err = ksmbd_vfs_remove_xattr(idmap, path,

						     name);

						     name, true);

			if (err)

				ksmbd_debug(SMB, "remove xattr failed : %s\n",

					    name);
@@ -2842,20 +2849,11 @@ int smb2_open(struct ksmbd_work *work) 
	}



	if (req->NameLength) {

		if ((req->CreateOptions & FILE_DIRECTORY_FILE_LE) &&

		    *(char *)req->Buffer == '\\') {

			pr_err("not allow directory name included leading slash\n");

			rc = -EINVAL;

			goto err_out2;

		}



		name = smb2_get_name((char *)req + le16_to_cpu(req->NameOffset),

				     le16_to_cpu(req->NameLength),

				     work->conn->local_nls);

		if (IS_ERR(name)) {

			rc = PTR_ERR(name);

			if (rc != -ENOMEM)

				rc = -ENOENT;

			name = NULL;

			goto err_out2;

		}

fs/smb/server/vfs.c

+11 −6
Original line number Diff line number Diff line
@@ -1058,15 +1058,20 @@ int ksmbd_vfs_fqar_lseek(struct ksmbd_file *fp, loff_t start, loff_t length, 
}



int ksmbd_vfs_remove_xattr(struct mnt_idmap *idmap,

			   const struct path *path, char *attr_name)

			   const struct path *path, char *attr_name,

			   bool get_write)

{

	int err;



	if (get_write == true) {

		err = mnt_want_write(path->mnt);

		if (err)

			return err;

	}



	err = vfs_removexattr(idmap, path->dentry, attr_name);



	if (get_write == true)

		mnt_drop_write(path->mnt);



	return err;
@@ -1380,7 +1385,7 @@ int ksmbd_vfs_remove_sd_xattrs(struct mnt_idmap *idmap, const struct path *path) 
		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(idmap, path, name);

			err = ksmbd_vfs_remove_xattr(idmap, path, name, true);

			if (err)

				ksmbd_debug(SMB, "remove xattr failed : %s\n", name);

		}

fs/smb/server/vfs.h

+2 −1
Original line number Diff line number Diff line
@@ -114,7 +114,8 @@ int ksmbd_vfs_setxattr(struct mnt_idmap *idmap, 
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 mnt_idmap *idmap,

			   const struct path *path, char *attr_name);

			   const struct path *path, char *attr_name,

			   bool get_write);

int ksmbd_vfs_kern_path_locked(struct ksmbd_work *work, char *name,

			       unsigned int flags, struct path *parent_path,

			       struct path *path, bool caseless);

fs/smb/server/vfs_cache.c

+2 −1
Original line number Diff line number Diff line
@@ -254,7 +254,8 @@ static void __ksmbd_inode_close(struct ksmbd_file *fp) 
		ci->m_flags &= ~S_DEL_ON_CLS_STREAM;

		err = ksmbd_vfs_remove_xattr(file_mnt_idmap(filp),

					     &filp->f_path,

					     fp->stream.name);

					     fp->stream.name,

					     true);

		if (err)

			pr_err("remove xattr failed : %s\n",

			       fp->stream.name);