]> git.apps.os.sepia.ceph.com Git - xfsprogs-dev.git/commitdiff
xfs: sb_spino_align is not verified
authorDave Chinner <dchinner@redhat.com>
Mon, 25 Nov 2024 21:14:11 +0000 (13:14 -0800)
committerDarrick J. Wong <djwong@kernel.org>
Tue, 24 Dec 2024 02:01:23 +0000 (18:01 -0800)
Source kernel commit: 59e43f5479cce106d71c0b91a297c7ad1913176c

It's just read in from the superblock and used without doing any
validity checks at all on the value.

Fixes: fb4f2b4e5a82 ("xfs: add sparse inode chunk alignment superblock field")
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
libxfs/xfs_sb.c

index 0603e5087f2e46639972f96697d39fab03daca89..0d98b8a344209ee8b55b2d153a10fe9bb071a17f 100644 (file)
@@ -395,6 +395,20 @@ xfs_validate_sb_common(
                                         sbp->sb_inoalignmt, align);
                                return -EINVAL;
                        }
+
+                       if (!sbp->sb_spino_align ||
+                           sbp->sb_spino_align > sbp->sb_inoalignmt ||
+                           (sbp->sb_inoalignmt % sbp->sb_spino_align) != 0) {
+                               xfs_warn(mp,
+                               "Sparse inode alignment (%u) is invalid.",
+                                       sbp->sb_spino_align);
+                               return -EINVAL;
+                       }
+               } else if (sbp->sb_spino_align) {
+                       xfs_warn(mp,
+                               "Sparse inode alignment (%u) should be zero.",
+                               sbp->sb_spino_align);
+                       return -EINVAL;
                }
        } else if (sbp->sb_qflags & (XFS_PQUOTA_ENFD | XFS_GQUOTA_ENFD |
                                XFS_PQUOTA_CHKD | XFS_GQUOTA_CHKD)) {