From: Greg Kroah-Hartman Date: Wed, 23 Jan 2019 08:03:19 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v4.20.5~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=63c89e6b646257599f6f4a337f42c098f23be310;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: xfs-don-t-fail-when-converting-shortform-attr-to-long-form-during-attr_replace.patch --- diff --git a/queue-4.4/series b/queue-4.4/series index f4974707541..feca0e03e67 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -73,3 +73,4 @@ media-vb2-be-sure-to-unlock-mutex-on-errors.patch r8169-add-support-for-new-realtek-ethernet.patch ipv6-consider-sk_bound_dev_if-when-binding-a-socket-to-a-v4-mapped-address.patch ipv6-take-rcu_read_lock-in-__inet6_bind-for-mapped-addresses.patch +xfs-don-t-fail-when-converting-shortform-attr-to-long-form-during-attr_replace.patch diff --git a/queue-4.4/xfs-don-t-fail-when-converting-shortform-attr-to-long-form-during-attr_replace.patch b/queue-4.4/xfs-don-t-fail-when-converting-shortform-attr-to-long-form-during-attr_replace.patch new file mode 100644 index 00000000000..0026ece57ec --- /dev/null +++ b/queue-4.4/xfs-don-t-fail-when-converting-shortform-attr-to-long-form-during-attr_replace.patch @@ -0,0 +1,48 @@ +From 7b38460dc8e4eafba06c78f8e37099d3b34d473c Mon Sep 17 00:00:00 2001 +From: "Darrick J. Wong" +Date: Tue, 17 Apr 2018 19:10:15 -0700 +Subject: xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE + +From: Darrick J. Wong + +commit 7b38460dc8e4eafba06c78f8e37099d3b34d473c upstream. + +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 +Reviewed-by: Christoph Hellwig +Signed-off-by: Darrick J. Wong +Cc: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman + +--- + fs/xfs/libxfs/xfs_attr.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- a/fs/xfs/libxfs/xfs_attr.c ++++ b/fs/xfs/libxfs/xfs_attr.c +@@ -528,7 +528,14 @@ xfs_attr_shortform_addname(xfs_da_args_t + if (args->flags & ATTR_CREATE) + return retval; + retval = xfs_attr_shortform_remove(args); +- ASSERT(retval == 0); ++ if (retval) ++ return retval; ++ /* ++ * Since we have removed the old attr, clear ATTR_REPLACE so ++ * that the leaf format add routine won't trip over the attr ++ * not being around. ++ */ ++ args->flags &= ~ATTR_REPLACE; + } + + if (args->namelen >= XFS_ATTR_SF_ENTSIZE_MAX ||