From: Darrick J. Wong <djwong@xxxxxxxxxx>
Enforce that all extended attributes have at most one namespace bit.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
libxfs/libxfs_api_defs.h | 1 +
repair/attr_repair.c | 15 +++++++++++++++
2 files changed, 16 insertions(+)
diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
index cc670d93a9f2..2d858580abfe 100644
--- a/libxfs/libxfs_api_defs.h
+++ b/libxfs/libxfs_api_defs.h
@@ -36,6 +36,7 @@
#define xfs_ascii_ci_hashname libxfs_ascii_ci_hashname
+#define xfs_attr_check_namespace libxfs_attr_check_namespace
#define xfs_attr_get libxfs_attr_get
#define xfs_attr_leaf_newentsize libxfs_attr_leaf_newentsize
#define xfs_attr_namecheck libxfs_attr_namecheck
diff --git a/repair/attr_repair.c b/repair/attr_repair.c
index 0f2f7a284bdd..a756a40db9b0 100644
--- a/repair/attr_repair.c
+++ b/repair/attr_repair.c
@@ -291,6 +291,13 @@ process_shortform_attr(
}
}
+ if (!libxfs_attr_check_namespace(currententry->flags)) {
+ do_warn(
+ _("multiple namespaces for shortform attribute %d in inode %" PRIu64 "\n"),
+ i, ino);
+ junkit = 1;
+ }
+
/* namecheck checks for null chars in attr names. */
if (!libxfs_attr_namecheck(currententry->flags,
currententry->nameval,
@@ -641,6 +648,14 @@ process_leaf_attr_block(
break;
}
+ if (!libxfs_attr_check_namespace(entry->flags)) {
+ do_warn(
+ _("multiple namespaces for attribute entry %d in attr block %u, inode %" PRIu64 "\n"),
+ i, da_bno, ino);
+ clearit = 1;
+ break;
+ }
+
if (entry->flags & XFS_ATTR_INCOMPLETE) {
/* we are inconsistent state. get rid of us */
do_warn(
