Changeset b9060a83 in mainline

Timestamp:

2011-06-12T09:45:17Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

17fa0280

Parents:

010b52d8

Message:

Fix bug in fat_get_cluster_fat12 and fat_set_cluster_fat12:
offset should not be larger than size of sector

Location:

uspace

Files:

• app/filegen/filegen.c (modified) (1 diff)
• srv/fs/fat/fat_fat.c (modified) (10 diffs)

uspace/app/filegen/filegen.c

@@ -73 +73 @@
         close(fd);
         crc = ~crc;
-        printf("%s: %x\n", argv[1], crc);
+        printf("%s : %x\n", argv[1], crc);
 
         return 0;

uspace/srv/fs/fat/fat_fat.c

@@ -304 +304 @@
 
         offset = (clst + clst/2);
+        if (offset / BPS(bs) >= SF(bs))
+                return ERANGE;
+
         rc = block_get(&b, devmap_handle, RSCNT(bs) + SF(bs) * fatno +
             offset / BPS(bs), BLOCK_FLAGS_NONE);
@@ -309 +312 @@
                 return rc;
 
-        byte1 = ((uint8_t*) b->data)[offset];
-
+        byte1 = ((uint8_t*) b->data)[offset % BPS(bs)];
         /* This cluster access spans a sector boundary. Check only for FAT12 */
-        if ((offset % BPS(bs) + 1 == BPS(bs))) {
+        if ((offset % BPS(bs)) + 1 == BPS(bs)) {
                 /* Is it last sector of FAT? */
                 if (offset / BPS(bs) < SF(bs)) {
@@ -341 +343 @@
         }
         else
-                byte2 = ((uint8_t*) b->data)[offset+1];
+                byte2 = ((uint8_t*) b->data)[(offset % BPS(bs))+1];
 
 #ifdef __BE__   
@@ -351 +353 @@
         *value = uint16_t_le2host(*value);
         if (IS_ODD(clst))
-                *value = *value >> 4;
+                *value = (*value) >> 4;
         else
-                *value = *value & FAT12_MASK;
-
+                *value = (*value) & FAT12_MASK;
+        
         rc = block_put(b);
-
         return rc;
 }
@@ -473 +474 @@
 
         offset = (clst + clst/2);
+        if (offset / BPS(bs) >= SF(bs))
+                return ERANGE;
+        
         rc = block_get(&b, devmap_handle, RSCNT(bs) + SF(bs) * fatno +
             offset / BPS(bs), BLOCK_FLAGS_NONE);
@@ -478 +482 @@
                 return rc;
 
-        byte1 = ((uint8_t*) b->data)[offset];
+        byte1 = ((uint8_t*) b->data)[offset % BPS(bs)];
         bool border = false;
         /* This cluster access spans a sector boundary. Check only for FAT12 */
-        if (offset % BPS(bs)+1 == BPS(bs)) {
+        if ((offset % BPS(bs))+1 == BPS(bs)) {
                 /* Is it last sector of FAT? */
                 if (offset / BPS(bs) < SF(bs)) {
@@ -492 +496 @@
                         }
                         /*
-                        * Combining value with last byte of current sector and
-                        * first byte of next sector
-                        */
+                         * Combining value with last byte of current sector and
+                         * first byte of next sector
+                         */
                         byte2 = ((uint8_t*) b1->data)[0];
                         border = true;
@@ -505 +509 @@
         }
         else
-                byte2 = ((uint8_t*) b->data)[offset+1];
+                byte2 = ((uint8_t*) b->data)[(offset % BPS(bs))+1];
 
         if (IS_ODD(clst)) {
@@ -520 +524 @@
         byte2 = byte2 | (value >> 8);
 
-        ((uint8_t*) b->data)[offset] = byte1;
+        ((uint8_t*) b->data)[(offset % BPS(bs))] = byte1;
         if (border) {
                 ((uint8_t*) b1->data)[0] = byte2;
@@ -531 +535 @@
                 }
         } else 
-                ((uint8_t*) b->data)[offset+1] = byte2;
+                ((uint8_t*) b->data)[(offset % BPS(bs))+1] = byte2;
 
         b->dirty = true;        /* need to sync block */