* [PATCH] xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE
@ 2018-04-18 0:31 Darrick J. Wong
2018-04-18 0:45 ` Dave Chinner
2018-04-18 10:31 ` Christoph Hellwig
0 siblings, 2 replies; 5+ messages in thread
From: Darrick J. Wong @ 2018-04-18 0:31 UTC (permalink / raw)
To: xfs; +Cc: kanda.motohiro
From: Darrick J. Wong <darrick.wong@oracle.com>
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. Something's
broken and we should bail out and shut down.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199119
Reported-by: kanda.motohiro@gmail.com
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/libxfs/xfs_attr.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index ce4a34a..2588c73 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -511,7 +511,14 @@ xfs_attr_shortform_addname(xfs_da_args_t *args)
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 here,
+ * further lookup will fail with ENOATTR.
+ * Ignore this was a replace and go on creating new attr.
+ */
+ args->flags &= ~ATTR_REPLACE;
}
if (args->namelen >= XFS_ATTR_SF_ENTSIZE_MAX ||
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE
2018-04-18 0:31 [PATCH] xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE Darrick J. Wong
@ 2018-04-18 0:45 ` Dave Chinner
2018-04-18 0:51 ` Darrick J. Wong
2018-04-18 10:31 ` Christoph Hellwig
1 sibling, 1 reply; 5+ messages in thread
From: Dave Chinner @ 2018-04-18 0:45 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: xfs, kanda.motohiro
On Tue, Apr 17, 2018 at 05:31:30PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> 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. Something's
> broken and we should bail out and shut down.
>
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199119
> Reported-by: kanda.motohiro@gmail.com
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/libxfs/xfs_attr.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index ce4a34a..2588c73 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -511,7 +511,14 @@ xfs_attr_shortform_addname(xfs_da_args_t *args)
> 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 here,
> + * further lookup will fail with ENOATTR.
> + * Ignore this was a replace and go on creating new attr.
The last line of that comment doesn't make sense to me. not sure
what it's meant to say...
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE
2018-04-18 0:45 ` Dave Chinner
@ 2018-04-18 0:51 ` Darrick J. Wong
2018-04-18 1:11 ` Dave Chinner
0 siblings, 1 reply; 5+ messages in thread
From: Darrick J. Wong @ 2018-04-18 0:51 UTC (permalink / raw)
To: Dave Chinner; +Cc: xfs, kanda.motohiro
On Wed, Apr 18, 2018 at 10:45:21AM +1000, Dave Chinner wrote:
> On Tue, Apr 17, 2018 at 05:31:30PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> >
> > 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. Something's
> > broken and we should bail out and shut down.
> >
> > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199119
> > Reported-by: kanda.motohiro@gmail.com
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> > fs/xfs/libxfs/xfs_attr.c | 9 ++++++++-
> > 1 file changed, 8 insertions(+), 1 deletion(-)
> >
> > diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> > index ce4a34a..2588c73 100644
> > --- a/fs/xfs/libxfs/xfs_attr.c
> > +++ b/fs/xfs/libxfs/xfs_attr.c
> > @@ -511,7 +511,14 @@ xfs_attr_shortform_addname(xfs_da_args_t *args)
> > 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 here,
> > + * further lookup will fail with ENOATTR.
> > + * Ignore this was a replace and go on creating new attr.
>
> The last line of that comment doesn't make sense to me. not sure
> what it's meant to say...
That was what was in the patch attached to the bugzilla. :)
How about:
/*
* 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.
*/
instead?
--D
>
> Cheers,
>
> Dave.
> --
> Dave Chinner
> david@fromorbit.com
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE
2018-04-18 0:51 ` Darrick J. Wong
@ 2018-04-18 1:11 ` Dave Chinner
0 siblings, 0 replies; 5+ messages in thread
From: Dave Chinner @ 2018-04-18 1:11 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: xfs, kanda.motohiro
On Tue, Apr 17, 2018 at 05:51:07PM -0700, Darrick J. Wong wrote:
> On Wed, Apr 18, 2018 at 10:45:21AM +1000, Dave Chinner wrote:
> > On Tue, Apr 17, 2018 at 05:31:30PM -0700, Darrick J. Wong wrote:
> > > From: Darrick J. Wong <darrick.wong@oracle.com>
> > >
> > > 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. Something's
> > > broken and we should bail out and shut down.
> > >
> > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199119
> > > Reported-by: kanda.motohiro@gmail.com
> > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > > ---
> > > fs/xfs/libxfs/xfs_attr.c | 9 ++++++++-
> > > 1 file changed, 8 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> > > index ce4a34a..2588c73 100644
> > > --- a/fs/xfs/libxfs/xfs_attr.c
> > > +++ b/fs/xfs/libxfs/xfs_attr.c
> > > @@ -511,7 +511,14 @@ xfs_attr_shortform_addname(xfs_da_args_t *args)
> > > 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 here,
> > > + * further lookup will fail with ENOATTR.
> > > + * Ignore this was a replace and go on creating new attr.
> >
> > The last line of that comment doesn't make sense to me. not sure
> > what it's meant to say...
>
> That was what was in the patch attached to the bugzilla. :)
>
> How about:
>
> /*
> * 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.
> */
>
> instead?
Yup, that makes sense now.
Reviewed-by: Dave Chinner <dchinner@redhat.com>
-Dave.
--
Dave Chinner
david@fromorbit.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE
2018-04-18 0:31 [PATCH] xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE Darrick J. Wong
2018-04-18 0:45 ` Dave Chinner
@ 2018-04-18 10:31 ` Christoph Hellwig
1 sibling, 0 replies; 5+ messages in thread
From: Christoph Hellwig @ 2018-04-18 10:31 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: xfs, kanda.motohiro
Looks fine with the updated comment.
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-04-18 10:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-18 0:31 [PATCH] xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE Darrick J. Wong
2018-04-18 0:45 ` Dave Chinner
2018-04-18 0:51 ` Darrick J. Wong
2018-04-18 1:11 ` Dave Chinner
2018-04-18 10:31 ` Christoph Hellwig
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.