1 files changed, 7 insertions, 9 deletions
diff --git a/arch/x86_64/sys/serial.c b/arch/x86_64/sys/serial.c
index 48a14c7..12db6fd 100644
--- a/arch/x86_64/sys/serial.c
+++ b/arch/x86_64/sys/serial.c
@@ -9,15 +9,13 @@ s_syscall_serial_write(
         size_t payload_bytes,
         void *payload_data)
 {
-    if(payload_bytes < sizeof(struct syscall_serial_write)) {
-        kprintf("syscall_serial_write: message is too small for this syscall!\n");
-        return EOOB;
-    }
-    struct syscall_serial_write *payload = payload_data;
-    if(payload_bytes < sizeof(struct syscall_serial_write) + payload->len) {
-        kprintf("syscall_serial_write: message is to small for payload!\n");
-        return EOOB;
-    }
+    size_t bytes_needed = sizeof(struct syscall_generic_write);
+    CHECK_TOOSMALL(bytes_needed, payload_bytes, "Message is too small for this syscall!");
+
+    struct syscall_generic_write *payload = payload_data;
+    bytes_needed += payload->len * 2;
+    CHECK_TOOSMALL(bytes_needed, payload_bytes, "Message is too small for write buffer!");
+    
     return serial_com_write(serial_com, payload->data, payload->len);
 }