xfs: check shortform attr entry flags specifically

While reviewing flag checking in the attr scrub functions, we noticed
that the shortform attr scanner didn't catch entries that have the LOCAL
or INCOMPLETE bits set.  Neither of these flags can ever be set on a
shortform attr, so we need to check this narrower set of valid flags.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/scrub/attr.c b/fs/xfs/scrub/attr.c
index 5ca79af47e81e69776715e9d7de99f4be6571212..fd22d652a63a1281505c584e09726f285fd9f0bf 100644 (file)
--- a/fs/xfs/scrub/attr.c
+++ b/fs/xfs/scrub/attr.c
@@ -579,6 +579,15 @@ xchk_xattr_check_sf(
                        break;
                }
 
+               /*
+                * Shortform entries do not set LOCAL or INCOMPLETE, so the
+                * only valid flag bits here are for namespaces.
+                */
+               if (sfe->flags & ~XFS_ATTR_NSP_ONDISK_MASK) {
+                       xchk_fblock_set_corrupt(sc, XFS_ATTR_FORK, 0);
+                       break;
+               }
+
                if (!xchk_xattr_set_map(sc, ab->usedmap,
                                (char *)sfe - (char *)sf,
                                sizeof(struct xfs_attr_sf_entry))) {