Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9597a30 authored by Hu Weiwen's avatar Hu Weiwen Committed by Greg Kroah-Hartman
Browse files

ceph: don't truncate file in atomic_open 



commit 7cb9994754f8a36ae9e5ec4597c5c4c2d6c03832 upstream.

Clear O_TRUNC from the flags sent in the MDS create request.

`atomic_open' is called before permission check. We should not do any
modification to the file here. The caller will do the truncation
afterward.

Fixes: 124e68e7 ("ceph: file operations")
Signed-off-by: default avatarHu Weiwen <sehuww@mail.scut.edu.cn>
Reviewed-by: default avatarXiubo Li <xiubli@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
[Xiubo: fixed a trivial conflict for 5.10 backport]
Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bf98be80

fs/ceph/file.c

+7 −3
Original line number Diff line number Diff line
@@ -446,6 +446,12 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry, 
	if (dentry->d_name.len > NAME_MAX)

		return -ENAMETOOLONG;



	/*

	 * Do not truncate the file, since atomic_open is called before the

	 * permission check. The caller will do the truncation afterward.

	 */

	flags &= ~O_TRUNC;



	if (flags & O_CREAT) {

		if (ceph_quota_is_max_files_exceeded(dir))

			return -EDQUOT;
@@ -478,9 +484,7 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry, 


	req->r_parent = dir;

	set_bit(CEPH_MDS_R_PARENT_LOCKED, &req->r_req_flags);

	err = ceph_mdsc_do_request(mdsc,

				   (flags & (O_CREAT|O_TRUNC)) ? dir : NULL,

				   req);

	err = ceph_mdsc_do_request(mdsc, (flags & O_CREAT) ? dir : NULL, req);

	err = ceph_handle_snapdir(req, dentry, err);

	if (err)

		goto out_req;