]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ceph: don't truncate file in atomic_open
authorHu Weiwen <sehuww@mail.scut.edu.cn>
Fri, 1 Jul 2022 02:52:27 +0000 (10:52 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 15 Oct 2022 05:54:39 +0000 (07:54 +0200)
commit 0e2a91849ef33dd9310a3cbce28e1606b117501f 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: 71821f84a646 ("ceph: file operations")
Signed-off-by: Hu Weiwen <sehuww@mail.scut.edu.cn>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
[Xiubo: fixed a trivial conflict for 5.10 backport]
Signed-off-by: Xiubo Li <xiubli@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/ceph/file.c

index aa1eac6d89f2e436cfe155389099f678cb216c54..83122fc5f8130b8128018658029b280d9e7c4258 100644 (file)
@@ -452,6 +452,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;
@@ -490,9 +496,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;