printf security

checkra1n · Jun 15, 2021 · 8224af1 · 8224af1
1 parent db01c5d
commit 8224af1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/example/include/pongo.h b/example/include/pongo.h
@@ -145,7 +145,7 @@ struct pongo_exports {
     void * value;
 };
 
-extern void panic(const char* string);
+extern _Noreturn __attribute__((format(printf, 1, 2))) void panic(const char* string, ...);
 extern void spin(uint32_t usec);
 extern uint64_t get_ticks();
 extern void usleep(uint32_t usec);

diff --git a/src/kernel/mm.c b/src/kernel/mm.c
@@ -875,7 +875,7 @@ uint64_t alloc_phys(uint32_t size) {
         }
     }
     if (!found) panic("alloc_phys: OOM");
-    if (!rv) panic("alloc_phys: returning NULL?? (size %llx, npages %llx, found_pages %llx)", size, npages, found_pages);
+    if (!rv) panic("alloc_phys: returning NULL?? (size 0x%x, npages 0x%x, found_pages 0x%x)", size, npages, found_pages);
     phys_unlink_contiguous(rv, size);
     phys_reference(rv, size);
     enable_interrupts();

diff --git a/src/kernel/pongo.h b/src/kernel/pongo.h
@@ -402,7 +402,7 @@ extern void task_irq_dispatch(uint32_t intr);
 extern void task_yield_asserted();
 extern void task_register_unlinked(struct task* task, void (*entry)());
 extern void task_suspend_self();
-extern _Noreturn void panic(const char* string, ...);
+extern _Noreturn __attribute__((format(printf, 1, 2))) void panic(const char* string, ...);
 extern void pmgr_reset();
 extern void spin(uint32_t usec);
 extern void task_set_sched_head(struct task* task);

diff --git a/src/shell/main.c b/src/shell/main.c
@@ -179,7 +179,7 @@ void panic_cmd(const char* cmd, char* args) {
     if (! *args) {
         panic("panic called from shell");
     } else {
-        panic(args);
+        panic("%s", args);
     }
 }