Merge tag 'ceph-for-4.11-rc9' of git://github.com/ceph/ceph-client

Pull ceph fix from Ilya Dryomov:
 "A fix for a kernel stack overflow bug in ceph setattr code, marked for
  stable"

* tag 'ceph-for-4.11-rc9' of git://github.com/ceph/ceph-client:
  ceph: fix recursion between ceph_set_acl() and __ceph_setattr()

1 files changed, 10 insertions, 12 deletions

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index d449e1c03cbd..d3119fe3ab45 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -2071,11 +2071,6 @@ int __ceph_setattr(struct inode *inode, struct iattr *attr)
         if (inode_dirty_flags)
                 __mark_inode_dirty(inode, inode_dirty_flags);
 
-        if (ia_valid & ATTR_MODE) {
-                err = posix_acl_chmod(inode, attr->ia_mode);
-                if (err)
-                        goto out_put;
-        }
 
         if (mask) {
                 req->r_inode = inode;
@@ -2089,13 +2084,11 @@ int __ceph_setattr(struct inode *inode, struct iattr *attr)
              ceph_cap_string(dirtied), mask);
 
         ceph_mdsc_put_request(req);
-        if (mask & CEPH_SETATTR_SIZE)
-                __ceph_do_pending_vmtruncate(inode);
-        ceph_free_cap_flush(prealloc_cf);
-        return err;
-out_put:
-        ceph_mdsc_put_request(req);
         ceph_free_cap_flush(prealloc_cf);
+
+        if (err >= 0 && (mask & CEPH_SETATTR_SIZE))
+                __ceph_do_pending_vmtruncate(inode);
+
         return err;
 }
 
@@ -2114,7 +2107,12 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr)
         if (err != 0)
                 return err;
 
-        return __ceph_setattr(inode, attr);
+        err = __ceph_setattr(inode, attr);
+
+        if (err >= 0 && (attr->ia_valid & ATTR_MODE))
+                err = posix_acl_chmod(inode, attr->ia_mode);
+
+        return err;
 }
 
 /*