From 4d4ea220816061aaff60047350a87fd8d48d516b Mon Sep 17 00:00:00 2001 From: Chandan Babu R Date: Fri, 12 Feb 2021 17:23:05 -0500 Subject: [PATCH] xfsprogs: xfs_fsr: Verify bulkstat version information in qsort's cmp() This commit introduces a check to verify that correct bulkstat structures are being processed by qsort's cmp() function. Suggested-by: Darrick J. Wong Signed-off-by: Chandan Babu R Reviewed-by: Chaitanya Kulkarni Reviewed-by: Darrick J. Wong Signed-off-by: Eric Sandeen --- fsr/xfs_fsr.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c index b885395ed..6cf8bfb7f 100644 --- a/fsr/xfs_fsr.c +++ b/fsr/xfs_fsr.c @@ -582,8 +582,15 @@ fsrall_cleanup(int timeout) static int cmp(const void *s1, const void *s2) { - return( ((struct xfs_bulkstat *)s2)->bs_extents - - ((struct xfs_bulkstat *)s1)->bs_extents); + const struct xfs_bulkstat *bs1 = s1; + const struct xfs_bulkstat *bs2 = s2; + + ASSERT((bs1->bs_version == XFS_BULKSTAT_VERSION_V1 && + bs2->bs_version == XFS_BULKSTAT_VERSION_V1) || + (bs1->bs_version == XFS_BULKSTAT_VERSION_V5 && + bs2->bs_version == XFS_BULKSTAT_VERSION_V5)); + + return (bs2->bs_extents - bs1->bs_extents); } /* -- 2.47.3