Changeset bbc28be in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2010-12-03T12:59:13Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

70c85211

Parents:

2e15ac40 (diff), da55d5b (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:

Merged branch development into /lelian/hidd

File:

• kernel/generic/src/console/cmd.c (modified) (12 diffs)

kernel/generic/src/console/cmd.c

@@ -554 +554 @@
         }
         
+        unsigned int _len = (unsigned int) len;
+        if ((_len != len) || (((int) _len) < 0)) {
+                printf("Command length overflow\n");
+                return 1;
+        }
+        
         for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
                 cmd_info_t *hlp;
@@ -559 +565 @@
                 
                 spinlock_lock(&hlp->lock);
-                printf("%-*s %s\n", len, hlp->name, hlp->description);
+                printf("%-*s %s\n", _len, hlp->name, hlp->description);
                 spinlock_unlock(&hlp->lock);
         }
@@ -668 +674 @@
                 fnc = (unative_t (*)(void)) arch_construct_function(&fptr,
                     (void *) symaddr, (void *) cmd_call0);
-                printf("Calling %s() (%p)\n", symbol, symaddr);
+                printf("Calling %s() (%p)\n", symbol, (void *) symaddr);
                 printf("Result: %#" PRIxn "\n", fnc());
                 interrupts_restore(ipl);
@@ -685 +691 @@
          */
         
-        size_t i;
+        unsigned int i;
         for (i = 0; i < config.cpu_count; i++) {
                 if (!cpus[i].active)
@@ -697 +703 @@
                         irq_spinlock_unlock(&thread->lock, true);
                         
-                        printf("cpu%" PRIs ": ", i);
+                        printf("cpu%u: ", i);
                         
                         thread_ready(thread);
@@ -703 +709 @@
                         thread_detach(thread);
                 } else
-                        printf("Unable to create thread for cpu%" PRIs "\n", i);
+                        printf("Unable to create thread for cpu%u\n", i);
         }
         
@@ -731 +737 @@
 
                 ipl = interrupts_disable();
-                fnc = (unative_t (*)(unative_t, ...)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call1);
-                printf("Calling f(%#" PRIxn "): %p: %s\n", arg1, symaddr, symbol);
+                fnc = (unative_t (*)(unative_t, ...))
+                    arch_construct_function(&fptr, (void *) symaddr,
+                    (void *) cmd_call1);
+                printf("Calling f(%#" PRIxn "): %p: %s\n", arg1,
+                    (void *) symaddr, symbol);
                 printf("Result: %#" PRIxn "\n", fnc(arg1));
                 interrupts_restore(ipl);
@@ -765 +774 @@
 
                 ipl = interrupts_disable();
-                fnc = (unative_t (*)(unative_t, unative_t, ...)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call2);
+                fnc = (unative_t (*)(unative_t, unative_t, ...))
+                    arch_construct_function(&fptr, (void *) symaddr,
+                    (void *) cmd_call2);
                 printf("Calling f(%#" PRIxn ", %#" PRIxn "): %p: %s\n", 
-                       arg1, arg2, symaddr, symbol);
+                       arg1, arg2, (void *) symaddr, symbol);
                 printf("Result: %#" PRIxn "\n", fnc(arg1, arg2));
                 interrupts_restore(ipl);
@@ -800 +811 @@
 
                 ipl = interrupts_disable();
-                fnc = (unative_t (*)(unative_t, unative_t, unative_t, ...)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call3);
-                printf("Calling f(%#" PRIxn ",%#" PRIxn ", %#" PRIxn "): %p: %s\n", 
-                       arg1, arg2, arg3, symaddr, symbol);
+                fnc = (unative_t (*)(unative_t, unative_t, unative_t, ...))
+                    arch_construct_function(&fptr, (void *) symaddr,
+                    (void *) cmd_call3);
+                printf("Calling f(%#" PRIxn ",%#" PRIxn ", %#" PRIxn "): %p: %s\n",
+                       arg1, arg2, arg3, (void *) symaddr, symbol);
                 printf("Result: %#" PRIxn "\n", fnc(arg1, arg2, arg3));
                 interrupts_restore(ipl);
@@ -875 +888 @@
         
         if (rc == ENOENT)
-                printf("Symbol %s not found.\n", argv->buffer);
+                printf("Symbol %s not found.\n", (char *) argv->buffer);
         else if (rc == EINVAL)
                 printf("Invalid address.\n");
@@ -884 +897 @@
                 if (pointer)
                         addr = *(uintptr_t *) addr;
-                printf("Writing %#" PRIx64 " -> %p\n", arg1, addr);
+                printf("Writing %#" PRIx32" -> %p\n", arg1, (void *) addr);
                 *(uint32_t *) addr = arg1;
         } else
@@ -1172 +1185 @@
         }
         
+        unsigned int _len = (unsigned int) len;
+        if ((_len != len) || (((int) _len) < 0)) {
+                printf("Command length overflow\n");
+                return;
+        }
+        
         for (test = tests; test->name != NULL; test++)
-                printf("%-*s %s%s\n", len, test->name, test->desc, (test->safe ? "" : " (unsafe)"));
-        
-        printf("%-*s Run all safe tests\n", len, "*");
+                printf("%-*s %s%s\n", _len, test->name, test->desc,
+                    (test->safe ? "" : " (unsafe)"));
+        
+        printf("%-*s Run all safe tests\n", _len, "*");
 }