Changeset 5bda2f96 in mainline for uspace/srv

Timestamp:

2010-02-09T21:03:02Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

83b4cf53

Parents:

696979ce (diff), a60b2d7 (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 from mainline.

Location:

uspace/srv

Files:

• bd/file_bd/file_bd.c (modified) (3 diffs)
• taskmon/taskmon.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);
 

uspace/srv/taskmon/taskmon.c

@@ -49 +49 @@
 static void fault_event(ipc_callid_t callid, ipc_call_t *call)
 {
-        char *argv[11];
+        char *argv[6];
         char *fname;
         char *dump_fname;
@@ -66 +66 @@
         }
 
-        if (asprintf(&dump_fname, "/scratch/d" PRIuTASKID ".txt", taskid) < 0) {
+        if (asprintf(&dump_fname, "/data/core%" PRIuTASKID, taskid) < 0) {
                 printf("Memory allocation failed.\n");
                 return;
@@ -73 +73 @@
         printf(NAME ": Task %" PRIuTASKID " fault in thread %p.\n", taskid, thread);
 
-#ifdef CONFIG_VERBOSE_DUMPS
-        argv[0] = "/app/redir";
-        argv[1] = "-i";
-        argv[2] = "/readme";
-        argv[3] = "-o";
-        argv[4] = dump_fname;
-        argv[5] = "--";
-        argv[6] = "/app/taskdump";
-        argv[7] = "-m";
-        argv[8] = "-t";
-        argv[9] = s_taskid;
-        argv[10] = NULL;
+#ifdef CONFIG_WRITE_CORE_FILES
+        argv[0] = "/app/taskdump";
+        argv[1] = "-c";
+        argv[2] = dump_fname;
+        argv[3] = "-t";
+        argv[4] = s_taskid;
+        argv[5] = NULL;
 #else
         argv[0] = "/app/taskdump";