Changeset 77a2d77 in mainline

Timestamp:

2011-03-29T18:51:34Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2cf95e8

Parents:

ba5beaf

Message:

Do not search beyond the bitmap size limit

File:

• uspace/srv/fs/minixfs/mfs_balloc.c (modified) (4 diffs)

uspace/srv/fs/minixfs/mfs_balloc.c

@@ -12 +12 @@
 {
         struct mfs_sb_info *sbi;
-        unsigned start_block;
+        uint32_t limit;
         unsigned long nblocks;
-        unsigned *search, i;
+        unsigned *search, i, start_block;
         int r, freebit;
 
@@ -25 +25 @@
                 start_block = 2 + sbi->ibmap_blocks;
                 nblocks = sbi->zbmap_blocks;
+                limit = sbi->nzones;
         } else {
                 /*bid == BMAP_INODE*/
@@ -30 +31 @@
                 start_block = 2;
                 nblocks = sbi->ibmap_blocks;
+                limit = sbi->ninodes;
         }
 
@@ -52 +54 @@
                 /*Free bit found, compute real index*/
                 *idx = (freebit + sbi->block_size * 8 * i);
+                if (*idx > limit) {
+                        /*Index is beyond the limit, it is invalid*/
+                        block_put(b);
+                        break;
+                }
+
                 *search = i;
                 b->dirty = true;
                 block_put(b);
                 goto found;
-                
         }