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

Commit 19ac4474 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents f56fc7bd 8179a101

fs/ceph/inode.c

+10 −12
Original line number Diff line number Diff line
@@ -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;
@@ -2088,14 +2083,12 @@ int __ceph_setattr(struct inode *inode, struct iattr *attr) 
	dout("setattr %p result=%d (%s locally, %d remote)\n", inode, err,

	     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;

}



/*