summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYumei Huang <yuhuang@redhat.com>2021-01-22 16:48:19 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-07 11:25:56 +0100
commit4e40abb19ae33661f1cac3f426bf144485295f66 (patch)
tree66de843ea12936d4463347fa5fd023e9ef75c7a4
parent6ac49d2dfd82e552d5721086b7b7254f8e7d10a8 (diff)
downloadlinux-stable-4e40abb19ae33661f1cac3f426bf144485295f66.tar.gz
linux-stable-4e40abb19ae33661f1cac3f426bf144485295f66.tar.bz2
linux-stable-4e40abb19ae33661f1cac3f426bf144485295f66.zip
xfs: Fix assert failure in xfs_setattr_size()
commit 88a9e03beef22cc5fabea344f54b9a0dfe63de08 upstream. An assert failure is triggered by syzkaller test due to ATTR_KILL_PRIV is not cleared before xfs_setattr_size. As ATTR_KILL_PRIV is not checked/used by xfs_setattr_size, just remove it from the assert. Signed-off-by: Yumei Huang <yuhuang@redhat.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/xfs/xfs_iops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 0d587657056d..d5948fb386fa 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -820,7 +820,7 @@ xfs_setattr_size(
ASSERT(xfs_isilocked(ip, XFS_MMAPLOCK_EXCL));
ASSERT(S_ISREG(inode->i_mode));
ASSERT((iattr->ia_valid & (ATTR_UID|ATTR_GID|ATTR_ATIME|ATTR_ATIME_SET|
- ATTR_MTIME_SET|ATTR_KILL_PRIV|ATTR_TIMES_SET)) == 0);
+ ATTR_MTIME_SET|ATTR_TIMES_SET)) == 0);
oldsize = inode->i_size;
newsize = iattr->ia_size;