Changeset 7021c014 in rtems for cpukit/libfs/src/rfs/rtems-rfs-bitmaps.c

Timestamp:

10/15/20 06:14:22 (3 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

5

Children:

f84c4a5

Parents:

e71e271

git-author:

Chris Johns <chrisj@…> (10/15/20 06:14:22)

git-committer:

Chris Johns <chrisj@…> (10/16/20 23:55:30)

Message:

libfs/rfs: Check search bit map end on last bit

• Do not write past the last location of the search bit map whe nit is being created.

Closes #4149

File:

• cpukit/libfs/src/rfs/rtems-rfs-bitmaps.c (modified) (5 diffs)

cpukit/libfs/src/rfs/rtems-rfs-bitmaps.c

@@ -34 +34 @@
 #include <stdlib.h>
 #include <rtems/rfs/rtems-rfs-bitmaps.h>
+
+#define rtems_rfs_bitmap_check(_c, _sm) \
+   _Assert(_sm >= _c->search_bits && \
+           _sm < (_c->search_bits + \
+             rtems_rfs_bitmap_elements(rtems_rfs_bitmap_elements(_c->size))))
+
 
 /**
@@ -221 +227 @@
     offset = rtems_rfs_bitmap_map_offset (bit);
     search_map[index] = rtems_rfs_bitmap_set (search_map[index], 1 << offset);
+    rtems_rfs_bitmap_check(control, &search_map[index]);
   }
 
@@ -261 +268 @@
   offset            = rtems_rfs_bitmap_map_offset(bit);
   search_map[index] = rtems_rfs_bitmap_clear (search_map[index], 1 << offset);
+  rtems_rfs_bitmap_check(control, &search_map[index]);
   rtems_rfs_buffer_mark_dirty (control->buffer);
   control->free++;
@@ -600 +608 @@
   bit = 0;
 
+  rtems_rfs_bitmap_check(control, search_map);
   *search_map = RTEMS_RFS_BITMAP_ELEMENT_CLEAR;
   while (size)
@@ -634 +643 @@
     {
       bit = 0;
-      search_map++;
-      *search_map = RTEMS_RFS_BITMAP_ELEMENT_CLEAR;
+      if (size > 0)
+      {
+        search_map++;
+        rtems_rfs_bitmap_check(control, search_map);
+        *search_map = RTEMS_RFS_BITMAP_ELEMENT_CLEAR;
+      }
     }
     else