Recent parent pointer testing has exposed a bug in the underlying
larp state machine. A replace operation may remove an old attr
before adding the new one, but if it is the only attr in the fork,
then the fork is removed. This later causes a null pointer in
xfs_attr_try_sf_addname which expects the fork present. This
patch adds an extra state to create the fork.
Additionally the new state will be used by parent pointers which
need to add attributes to newly created inodes that do not yet
have a fork.
Signed-off-by: Allison Henderson <allison.henderson@xxxxxxxxxx>
---
fs/xfs/libxfs/xfs_attr.c | 22 ++++++++++++++++++++--
fs/xfs/libxfs/xfs_attr.h | 2 +-
fs/xfs/libxfs/xfs_bmap.c | 2 +-
fs/xfs/libxfs/xfs_bmap.h | 1 +
fs/xfs/xfs_attr_item.c | 4 +++-
5 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 836ab1b8ed7b..a94850d9b8b1 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -719,15 +719,31 @@ xfs_attr_set_iter(
struct xfs_attr_intent *attr)
{
struct xfs_da_args *args = attr->xattri_da_args;
+ int sf_size;
int error = 0;
/* State machine switch */
+
next_state:
switch (attr->xattri_dela_state) {
case XFS_DAS_UNINIT:
ASSERT(0);
return -EFSCORRUPTED;
+ case XFS_DAS_CREATE_FORK:
+ sf_size = sizeof(struct xfs_attr_sf_hdr) +
+ xfs_attr_sf_entsize_byname(args->namelen,
+ args->valuelen);
+ error = xfs_bmap_set_attrforkoff(args->dp, sf_size, NULL);
+ if (error)
+ return error;
+ args->dp->i_afp = kmem_cache_zalloc(xfs_ifork_cache, 0);
+ args->dp->i_afp->if_format = XFS_DINODE_FMT_EXTENTS;
+ fallthrough;
case XFS_DAS_SF_ADD:
+ if (!args->dp->i_afp) {
+ attr->xattri_dela_state = XFS_DAS_CREATE_FORK;
+ goto next_state;
+ }
return xfs_attr_sf_addname(attr);
case XFS_DAS_LEAF_ADD:
return xfs_attr_leaf_addname(attr);
@@ -920,8 +936,10 @@ xfs_attr_defer_add(
error = xfs_attr_intent_init(args, XFS_ATTRI_OP_FLAGS_SET, &new);
if (error)
return error;
-
- new->xattri_dela_state = xfs_attr_init_add_state(args);
+ if (!args->dp->i_afp)
+ new->xattri_dela_state = XFS_DAS_CREATE_FORK;
+ else
+ new->xattri_dela_state = xfs_attr_init_add_state(args);
xfs_defer_add(args->trans, XFS_DEFER_OPS_TYPE_ATTR, &new->xattri_list);
trace_xfs_attr_defer_add(new->xattri_dela_state, args->dp);
diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
index e329da3e7afa..7600eac74db7 100644
--- a/fs/xfs/libxfs/xfs_attr.h
+++ b/fs/xfs/libxfs/xfs_attr.h
@@ -445,7 +445,7 @@ struct xfs_attr_list_context {
*/
enum xfs_delattr_state {
XFS_DAS_UNINIT = 0, /* No state has been set yet */
-
+ XFS_DAS_CREATE_FORK, /* Create the attr fork */
/*
* Initial sequence states. The replace setup code relies on the
* ADD and REMOVE states for a specific format to be sequential so
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 6833110d1bd4..edafb6b1bfd6 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -977,7 +977,7 @@ xfs_bmap_add_attrfork_local(
/*
* Set an inode attr fork offset based on the format of the data fork.
*/
-static int
+int
xfs_bmap_set_attrforkoff(
struct xfs_inode *ip,
int size,
diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h
index 16db95b11589..a35945d44b80 100644
--- a/fs/xfs/libxfs/xfs_bmap.h
+++ b/fs/xfs/libxfs/xfs_bmap.h
@@ -172,6 +172,7 @@ void xfs_trim_extent(struct xfs_bmbt_irec *irec, xfs_fileoff_t bno,
xfs_filblks_t len);
unsigned int xfs_bmap_compute_attr_offset(struct xfs_mount *mp);
int xfs_bmap_add_attrfork(struct xfs_inode *ip, int size, int rsvd);
+int xfs_bmap_set_attrforkoff(struct xfs_inode *ip, int size, int *version);
void xfs_bmap_local_to_extents_empty(struct xfs_trans *tp,
struct xfs_inode *ip, int whichfork);
void xfs_bmap_compute_maxlevels(struct xfs_mount *mp, int whichfork);
diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
index 4a28c2d77070..f524dbbb42d3 100644
--- a/fs/xfs/xfs_attr_item.c
+++ b/fs/xfs/xfs_attr_item.c
@@ -625,7 +625,9 @@ xfs_attri_item_recover(
args->value = nv->value.i_addr;
args->valuelen = nv->value.i_len;
args->total = xfs_attr_calc_size(args, &local);
- if (xfs_inode_hasattr(args->dp))
+ if (!args->dp->i_afp)
+ attr->xattri_dela_state = XFS_DAS_CREATE_FORK;
+ else if (xfs_inode_hasattr(args->dp))
attr->xattri_dela_state = xfs_attr_init_replace_state(args);
else
attr->xattri_dela_state = xfs_attr_init_add_state(args);
--
2.25.1
