Fix segmentation fault due to allocation size

Change version

diff --git a/VERSION b/VERSION
index e0934a6433c23f6070b4f4f8a9f506cfb9b923b0..c34c4e5c0761fd4a759ccb156efe9bf0afa7a349 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=7
-PKG_REVISION=1
+PKG_REVISION=2
 PKG_BUILD=1

diff --git a/doc/CHANGES b/doc/CHANGES
index 57c6b59e2f3de5ef34c1d17cd90c2a11bbd38256..ff700245708af498775af5d71c2acce93fcaa312 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,10 +1,14 @@
-xfsprogs-2.7.1 (20 Septempber 2005)
+xfsprogs-2.7.2 (28 September 2005)
+        - Fix up xfs_repair segmentation fault due to wrong allocation
+          size.
+
+xfsprogs-2.7.1 (20 September 2005)
        - Fix up reporting of devices in xfs_growfs - now uses
          /proc/mounts in preference to /etc/mtab.
        - Fix a strtok-related bug in the extraction of device names,
          also only affecting xfs_growfs.
 
-xfsprogs-2.7.0 (16 Septempber 2005)
+xfsprogs-2.7.0 (16 September 2005)
        - Support for updated extended attributes format (attr2)
        - Make xfs_quota tool issue a quota sync in all the needed
          places, before reporting, to counter affects of delayed

diff --git a/repair/incore.c b/repair/incore.c
index 8a2a20bbe4ee48eaff12a7a38c9b236c4af9e4ad..09eb1a4a9c6870b2e99a8b7757c4691208f384e7 100644 (file)
--- a/repair/incore.c
+++ b/repair/incore.c
@@ -79,7 +79,8 @@ setup_bmap(xfs_agnumber_t agno, xfs_agblock_t numblocks, xfs_drtbno_t rtblocks)
                return;
        }
        for (i = 0; i < agno; i++)  {
-               size = roundup(numblocks / (NBBY/XR_BB),sizeof(__uint64_t));
+               size = roundup((numblocks+(NBBY/XR_BB)-1) / (NBBY/XR_BB),
+                               sizeof(__uint64_t));
 
                ba_bmap[i] = (__uint64_t*)memalign(sizeof(__uint64_t), size);
                if (!ba_bmap[i]) {