Commit f62847c9 authored Jan 22, 2021 by Yumei Huang Committed by Greg Kroah-Hartman Mar 07, 2021

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>

parent 1ffdc298

fs/xfs/xfs_iops.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -849,7 +849,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;