]> www.infradead.org Git - users/jedix/linux-maple.git/commit
xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE
authorDarrick J. Wong <darrick.wong@oracle.com>
Wed, 18 Apr 2018 02:10:15 +0000 (19:10 -0700)
committerBrian Maly <brian.maly@oracle.com>
Tue, 4 Dec 2018 19:50:40 +0000 (14:50 -0500)
commitadb2cf4030a4c2d59542f18d53784b5b593f3aeb
treed2ee78ee90a45db73f1449170c624f2ac823a855
parentd57761630072c15ae679cf541ea78f9b21839af5
xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE

Kanda Motohiro reported that expanding a tiny xattr into a large xattr
fails on XFS because we remove the tiny xattr from a shortform fork and
then try to re-add it after converting the fork to extents format having
not removed the ATTR_REPLACE flag.  This fails because the attr is no
longer present, causing a fs shutdown.

This is derived from the patch in his bug report, but we really
shouldn't ignore a nonzero retval from the remove call.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199119
Reported-by: kanda.motohiro@gmail.com
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
(cherry picked from commit 7b38460dc8e4eafba06c78f8e37099d3b34d473c)

Orabug: 28924091
CVE: CVE-2018-18690

Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Signed-off-by: Allen Pais <allen.pais@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
fs/xfs/libxfs/xfs_attr.c