xfs: Propagate dentry down to inode_change_ok()

commit 69bca80744eef58fa155e8042996b968fec17b26 upstream.

To avoid clearing of capabilities or security related extended
attributes too early, inode_change_ok() will need to take dentry instead
of inode. Propagate dentry down to functions calling inode_change_ok().
This is rather straightforward except for xfs_set_mode() function which
does not have dentry easily available. Luckily that function does not
call inode_change_ok() anyway so we just have to do a little dance with
function prototypes.

Acked-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
[bwh: Backported to 3.16:
 - Keep XFS_ERROR() calls
 - Adjust context, indentation]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index d2f4cb598b46b4a99758733a5b2d6cf753fc36dc..d00b21c5d3ec8baad219ad8e7f3558c03fe4f4a5 100644 (file)
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -862,7 +862,7 @@ xfs_file_fallocate(
 
                iattr.ia_valid = ATTR_SIZE;
                iattr.ia_size = new_size;
-               error = xfs_setattr_size(ip, &iattr);
+               error = xfs_vn_setattr_size(file->f_dentry, &iattr);
        }
 
 out_unlock:

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 174379ddf22f79588f68cef6e73b419d39464d46..63a77bb81176167a030ea67eade5b7e1c39b5507 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1776,7 +1776,7 @@ xfs_inactive_truncate(
        /*
         * Log the inode size first to prevent stale data exposure in the event
         * of a system crash before the truncate completes. See the related
-        * comment in xfs_setattr_size() for details.
+        * comment in xfs_vn_setattr_size() for details.
         */
        ip->i_d.di_size = 0;
        xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);

diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index afc859f44d013b83711f74859643b36fe8663bd0..dd2ef05fe64c7637a70c03f872ffcf66c3ea9f80 100644 (file)
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -717,7 +717,7 @@ xfs_ioc_space(
                iattr.ia_valid = ATTR_SIZE;
                iattr.ia_size = bf->l_start;
 
-               error = xfs_setattr_size(ip, &iattr);
+               error = xfs_vn_setattr_size(filp->f_dentry, &iattr);
                if (!error)
                        clrprealloc = true;
                break;

diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 125da8969c72ca87492bf56f8a8ec1f4d01076fa..9852ab70f1f594771b7de09ca25c2a452c2778f6 100644 (file)
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -525,6 +525,30 @@ xfs_setattr_time(
        }
 }
 
+static int
+xfs_vn_change_ok(
+       struct dentry   *dentry,
+       struct iattr    *iattr)
+{
+       struct inode            *inode = d_inode(dentry);
+       struct xfs_inode        *ip = XFS_I(inode);
+       struct xfs_mount        *mp = ip->i_mount;
+
+       if (mp->m_flags & XFS_MOUNT_RDONLY)
+               return XFS_ERROR(EROFS);
+
+       if (XFS_FORCED_SHUTDOWN(mp))
+               return XFS_ERROR(EIO);
+
+       return XFS_ERROR(-inode_change_ok(inode, iattr));
+}
+
+/*
+ * Set non-size attributes of an inode.
+ *
+ * Caution: The caller of this function is responsible for calling
+ * inode_change_ok() or otherwise verifying the change is fine.
+ */
 int
 xfs_setattr_nonsize(
        struct xfs_inode        *ip,
@@ -541,21 +565,6 @@ xfs_setattr_nonsize(
        struct xfs_dquot        *udqp = NULL, *gdqp = NULL;
        struct xfs_dquot        *olddquot1 = NULL, *olddquot2 = NULL;
 
-       trace_xfs_setattr(ip);
-
-       /* If acls are being inherited, we already have this checked */
-       if (!(flags & XFS_ATTR_NOACL)) {
-               if (mp->m_flags & XFS_MOUNT_RDONLY)
-                       return XFS_ERROR(EROFS);
-
-               if (XFS_FORCED_SHUTDOWN(mp))
-                       return XFS_ERROR(EIO);
-
-               error = -inode_change_ok(inode, iattr);
-               if (error)
-                       return XFS_ERROR(error);
-       }
-
        ASSERT((mask & ATTR_SIZE) == 0);
 
        /*
@@ -729,8 +738,27 @@ out_dqrele:
        return error;
 }
 
+int
+xfs_vn_setattr_nonsize(
+       struct dentry           *dentry,
+       struct iattr            *iattr)
+{
+       struct xfs_inode        *ip = XFS_I(d_inode(dentry));
+       int error;
+
+       trace_xfs_setattr(ip);
+
+       error = xfs_vn_change_ok(dentry, iattr);
+       if (error)
+               return error;
+       return xfs_setattr_nonsize(ip, iattr, 0);
+}
+
 /*
  * Truncate file.  Must have write permission and not be a directory.
+ *
+ * Caution: The caller of this function is responsible for calling
+ * inode_change_ok() or otherwise verifying the change is fine.
  */
 int
 xfs_setattr_size(
@@ -746,18 +774,6 @@ xfs_setattr_size(
        uint                    commit_flags = 0;
        bool                    did_zeroing = false;
 
-       trace_xfs_setattr(ip);
-
-       if (mp->m_flags & XFS_MOUNT_RDONLY)
-               return XFS_ERROR(EROFS);
-
-       if (XFS_FORCED_SHUTDOWN(mp))
-               return XFS_ERROR(EIO);
-
-       error = -inode_change_ok(inode, iattr);
-       if (error)
-               return XFS_ERROR(error);
-
        ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL));
        ASSERT(xfs_isilocked(ip, XFS_MMAPLOCK_EXCL));
        ASSERT(S_ISREG(ip->i_d.di_mode));
@@ -929,6 +945,22 @@ out_trans_cancel:
        goto out_unlock;
 }
 
+int
+xfs_vn_setattr_size(
+       struct dentry           *dentry,
+       struct iattr            *iattr)
+{
+       struct xfs_inode        *ip = XFS_I(d_inode(dentry));
+       int error;
+
+       trace_xfs_setattr(ip);
+
+       error = xfs_vn_change_ok(dentry, iattr);
+       if (error)
+               return error;
+       return xfs_setattr_size(ip, iattr);
+}
+
 STATIC int
 xfs_vn_setattr(
        struct dentry           *dentry,
@@ -939,10 +971,10 @@ xfs_vn_setattr(
 
        if (iattr->ia_valid & ATTR_SIZE) {
                xfs_ilock(ip, XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL);
-               error = xfs_setattr_size(ip, iattr);
+               error = xfs_vn_setattr_size(dentry, iattr);
                xfs_iunlock(ip, XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL);
        } else {
-               error = xfs_setattr_nonsize(ip, iattr, 0);
+               error = xfs_vn_setattr_nonsize(dentry, iattr);
        }
 
        return -error;

diff --git a/fs/xfs/xfs_iops.h b/fs/xfs/xfs_iops.h
index 1c34e4335920021d5829c5507be2f2c6c6bf60e1..fec65c0885436718b995945bfa2b2ea8728cbf33 100644 (file)
--- a/fs/xfs/xfs_iops.h
+++ b/fs/xfs/xfs_iops.h
@@ -34,6 +34,7 @@ extern void xfs_setup_inode(struct xfs_inode *);
 
 extern int xfs_setattr_nonsize(struct xfs_inode *ip, struct iattr *vap,
                               int flags);
-extern int xfs_setattr_size(struct xfs_inode *ip, struct iattr *vap);
+extern int xfs_vn_setattr_nonsize(struct dentry *dentry, struct iattr *vap);
+extern int xfs_vn_setattr_size(struct dentry *dentry, struct iattr *vap);
 
 #endif /* __XFS_IOPS_H__ */