Changeset a60b2d7 in mainline

Timestamp:

2010-02-09T20:32:11Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3149fc0, 5bda2f96

Parents:

eb73a50 (diff), fb150d78 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge: Harden file_bd again out-of-bounds access.

File:

• uspace/srv/bd/file_bd/file_bd.c (modified) (3 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -48 +48 @@
 #include <devmap.h>
 #include <sys/types.h>
+#include <sys/typefmt.h>
 #include <errno.h>
 #include <bool.h>
@@ -207 +208 @@
         int rc;
 
+        /* Check whether access is within device address bounds. */
+        if (ba + cnt > num_blocks) {
+                printf(NAME ": Accessed blocks %" PRIuBN "-%" PRIuBN ", while "
+                    "max block number is %" PRIuBN ".\n", ba, ba + cnt - 1,
+                    num_blocks - 1);
+                return ELIMIT;
+        }
+
         fibril_mutex_lock(&dev_lock);
 
@@ -237 +246 @@
         int rc;
 
+        /* Check whether access is within device address bounds. */
+        if (ba + cnt > num_blocks) {
+                printf(NAME ": Accessed blocks %" PRIuBN "-%" PRIuBN ", while "
+                    "max block numeber is %" PRIuBN ".\n", ba, ba + cnt - 1,
+                    num_blocks - 1);
+                return ELIMIT;
+        }
+
         fibril_mutex_lock(&dev_lock);