diff options
51 files changed, 311 insertions, 290 deletions
diff --git a/apps/chess.c b/apps/chess.c index 6670919..833edb0 100644 --- a/apps/chess.c +++ b/apps/chess.c @@ -58,7 +58,7 @@ static vec2 selected = { -1, -1 }; // Selected tile static void load_image(struct piece *tile) { char icon[48] = { 0 }; - sprintf(icon, "/icons/chess-%s-%d.png", tile->name, TILE); + snprintf(icon, sizeof(icon), "/icons/chess-%s-%d.png", tile->name, TILE); enum gfx_filter filter = IS_COLOR(tile->piece, BLACK) ? GFX_FILTER_NONE : GFX_FILTER_INVERT; /* assert(gui_fill(win, tile->widget, GUI_LAYER_FG, 0) == EOK); */ @@ -87,7 +87,7 @@ static void mouseclick(u32 widget_id, vec2 pos) clicked_piece->piece = selected_piece->piece; selected_piece->piece = 0; - strcpy(clicked_piece->name, selected_piece->name); + strlcpy(clicked_piece->name, selected_piece->name, sizeof(clicked_piece->name)); selected_piece->name[0] = '\0'; /* assert(gui_fill(win, selected_piece->widget, GUI_LAYER_FG, 0) == EOK); */ @@ -102,7 +102,7 @@ static void mouseclick(u32 widget_id, vec2 pos) } } -static const char *resolve_name(u32 piece, char *buf) +static const char *resolve_name(u32 piece, char buf[8]) { const char *name = NULL; switch (piece & TYPE_MASK) { @@ -128,7 +128,7 @@ static const char *resolve_name(u32 piece, char *buf) err(1, "Unknown piece %d\n", piece); } - strcpy(buf, name); + strlcpy(buf, name, 8); return buf; } @@ -204,7 +204,7 @@ static void fen_parse(const char *fen) u32 piece = fen_resolve_letter(*p); tiles[x][y].piece = piece; - resolve_name(piece, (char *)&tiles[x][y].name); + resolve_name(piece, tiles[x][y].name); x++; } diff --git a/apps/test.c b/apps/test.c index 18d9f8b..8c6dedc 100644 --- a/apps/test.c +++ b/apps/test.c @@ -79,7 +79,6 @@ TEST(mem) EQUALS(memcmp(str2, str4, strlen(str2)), -1); EQUALS(memcmp(str2, str3, strlen(str2)), 0); EQUALS(memcmp(str0, str1, strlen(str0)), 0); - EQUALS(memcmp(NULL, NULL, 0), 0); char buf[6] = { 0 }; EQUALS_STR(memcpy(buf, "hallo", 6), "hallo"); @@ -388,7 +388,7 @@ static void handle_message_redraw_window(struct message_redraw_window *msg) struct window *win = window_find(id); if (!win || win->client.pid != msg->header.src) { if (msg->header.state == MSG_NEED_ANSWER) - msg_send(msg->header.src, GUI_REDRAW_WINDOW | MSG_FAILURE, NULL, + msg_send(msg->header.src, GUI_REDRAW_WINDOW | MSG_FAILURE, msg, sizeof(msg->header)); return; } @@ -406,7 +406,7 @@ static void handle_message_destroy_window(struct message_destroy_window *msg) struct window *win = window_find(id); if (!win || win->client.pid != msg->header.src) { if (msg->header.state == MSG_NEED_ANSWER) - msg_send(msg->header.src, GUI_DESTROY_WINDOW | MSG_FAILURE, NULL, + msg_send(msg->header.src, GUI_DESTROY_WINDOW | MSG_FAILURE, msg, sizeof(msg->header)); return; } diff --git a/kernel/features/fs.c b/kernel/features/fs.c index d16b7b4..753adb4 100644 --- a/kernel/features/fs.c +++ b/kernel/features/fs.c @@ -109,10 +109,10 @@ static void vfs_list_mounts() res vfs_mount(struct device *dev, const char *path) { - if (!path || !memory_valid(path)) + if (!memory_valid(path)) return -EFAULT; - if (!dev || !memory_valid(dev) || !dev->id) + if (!memory_valid(dev) || !dev->id) return -EFAULT; if (vfs_mounted(dev, path)) @@ -131,10 +131,10 @@ res vfs_mount(struct device *dev, const char *path) res vfs_read(const char *path, void *buf, u32 offset, u32 count) { /* printf("%s READ: %s\n", proc_current() ? proc_current()->name : "Unknown", path); */ - if (!path || !memory_valid(path)) + if (!memory_valid(path)) return -EFAULT; - if (!buf || !memory_valid(buf)) + if (!memory_valid(buf)) return -EFAULT; struct mount_info *m = vfs_find_mount_info(path); @@ -160,10 +160,10 @@ res vfs_read(const char *path, void *buf, u32 offset, u32 count) res vfs_write(const char *path, void *buf, u32 offset, u32 count) { /* printf("%s WRITE: %s\n", proc_current() ? proc_current()->name : "Unknown", path); */ - if (!path || !memory_valid(path)) + if (!memory_valid(path)) return -EFAULT; - if (!buf || !memory_valid(buf)) + if (!memory_valid(buf)) return -EFAULT; struct mount_info *m = vfs_find_mount_info(path); @@ -188,7 +188,7 @@ res vfs_write(const char *path, void *buf, u32 offset, u32 count) res vfs_ioctl(const char *path, u32 request, void *arg1, void *arg2, void *arg3) { - if (!path || !memory_valid(path)) + if (!memory_valid(path)) return -EFAULT; struct mount_info *m = vfs_find_mount_info(path); @@ -210,10 +210,10 @@ res vfs_ioctl(const char *path, u32 request, void *arg1, void *arg2, void *arg3) res vfs_stat(const char *path, struct stat *buf) { - if (!path || !memory_valid(path)) + if (!memory_valid(path)) return -EFAULT; - if (!buf || !memory_valid(buf)) + if (!memory_valid(buf)) return -EFAULT; struct mount_info *m = vfs_find_mount_info(path); @@ -235,7 +235,7 @@ res vfs_stat(const char *path, struct stat *buf) res vfs_wait(const char *path, u32 func_ptr) { - if (!path || !func_ptr || !memory_valid(path)) + if (!func_ptr || !memory_valid(path)) return -EFAULT; struct mount_info *m = vfs_find_mount_info(path); @@ -257,7 +257,7 @@ res vfs_wait(const char *path, u32 func_ptr) res vfs_poll(const char **files) { - if (!files || !memory_valid(files)) + if (!memory_valid(files)) return -EFAULT; for (const char **p = files; *p && memory_valid(*p) && **p; p++) { @@ -276,7 +276,7 @@ res vfs_poll(const char **files) res vfs_ready(const char *path) { - if (!path || !memory_valid(path)) + if (!memory_valid(path)) return -EFAULT; struct mount_info *m = vfs_find_mount_info(path); diff --git a/kernel/features/load.c b/kernel/features/load.c index b46f772..c5039ed 100644 --- a/kernel/features/load.c +++ b/kernel/features/load.c @@ -11,7 +11,7 @@ res elf_load(const char *path, struct proc *proc) { - if (!path || !memory_valid(path) || !proc) + if (!memory_valid(path)) return -EFAULT; struct stat s = { 0 }; @@ -30,7 +30,7 @@ res elf_load(const char *path, struct proc *proc) if (read != sizeof(header)) return -ENOEXEC; - strcpy(proc->name, path); + strlcpy(proc->name, path, sizeof(proc->name)); // Valid? u8 *magic = header.ident; diff --git a/kernel/features/mm.c b/kernel/features/mm.c index d01c978..5356ab4 100644 --- a/kernel/features/mm.c +++ b/kernel/features/mm.c @@ -417,7 +417,7 @@ struct memory_proc_link { static struct list *memory_objects = NULL; res memory_sys_alloc(struct page_dir *dir, u32 size, u32 *addr, u32 *id, u8 shared) { - if (!addr || !memory_valid(addr) || !id || !memory_valid(id)) + if (!memory_valid(addr) || !memory_valid(id)) return -EFAULT; size = PAGE_ALIGN_UP(size); @@ -474,7 +474,7 @@ res memory_sys_free(struct page_dir *dir, u32 addr) res memory_sys_shaccess(struct page_dir *dir, u32 id, u32 *addr, u32 *size) { - if (!addr || !memory_valid(addr) || !size || !memory_valid(size)) + if (!memory_valid(addr) || !memory_valid(size)) return -EFAULT; *addr = 0; diff --git a/kernel/features/net.c b/kernel/features/net.c index 104538f..48cbf55 100644 --- a/kernel/features/net.c +++ b/kernel/features/net.c @@ -732,7 +732,7 @@ struct socket *net_open(enum socket_type type) int net_close(struct socket *socket) { - if (!net_installed() || !socket) + if (!net_installed()) return 1; if (socket->state == S_CLOSING) @@ -750,7 +750,7 @@ int net_close(struct socket *socket) int net_connect(struct socket *socket, u32 ip_addr, u16 dst_port) { - if (!net_installed() || !socket || socket->state != S_OPEN || !ip_addr || !dst_port) + if (!net_installed() || socket->state != S_OPEN || !ip_addr || !dst_port) return 0; socket->ip_addr = ip_addr; @@ -777,7 +777,7 @@ int net_connect(struct socket *socket, u32 ip_addr, u16 dst_port) void net_send(struct socket *socket, void *data, u32 len) { - if (!net_installed() || !socket || socket->state != S_CONNECTED) + if (!net_installed() || socket->state != S_CONNECTED) return; if (socket->type == S_TCP) { @@ -792,7 +792,7 @@ void net_send(struct socket *socket, void *data, u32 len) int net_receive(struct socket *socket, void *buf, u32 len) { - if (!net_installed() || !socket || !socket->packets) + if (!net_installed() || !socket->packets) return 0; u32 offset = 0; diff --git a/kernel/features/proc.c b/kernel/features/proc.c index ceaf27b..fde49bd 100644 --- a/kernel/features/proc.c +++ b/kernel/features/proc.c @@ -24,7 +24,7 @@ struct node *current = NULL; // TODO: Use less memcpy and only copy relevant registers (rewrite for efficiency argh) // TODO: 20 priority queues (https://www.kernel.org/doc/html/latest/scheduler/sched-nice-design.html) // TODO: Optimize scheduler -void scheduler(struct regs *regs) +HOT FLATTEN void scheduler(struct regs *regs) { if (quantum == 0) { quantum = PROC_QUANTUM; @@ -119,8 +119,6 @@ void proc_clear_quantum(void) void proc_exit(struct proc *proc, s32 status) { - assert(proc); - u8 found = 0; struct node *iterator = proc_list->head; while (iterator) { @@ -272,7 +270,7 @@ struct proc *proc_make(enum proc_priv priv) void proc_stack_push(struct proc *proc, u32 data) { - assert(proc && proc->regs.useresp > sizeof(data)); + assert(proc->regs.useresp > sizeof(data)); struct page_dir *prev; memory_backup_dir(&prev); diff --git a/kernel/inc/acpi.h b/kernel/inc/acpi.h index f2fd030..29dcd32 100644 --- a/kernel/inc/acpi.h +++ b/kernel/inc/acpi.h @@ -67,7 +67,7 @@ struct madt { u32 local_address; u32 flags; struct madt_entry_header entry; -} __attribute__((packed)); +} PACKED; #define MADT_LOCAL_APIC_ENTRY 0 #define MADT_IO_APIC_ENTRY 1 @@ -80,7 +80,7 @@ struct madt_local_apic_entry { u8 processor_id; u8 id; u32 flags; -} __attribute__((packed)); +} PACKED; struct madt_io_apic_entry { struct madt_entry_header header; @@ -88,7 +88,7 @@ struct madt_io_apic_entry { u8 reserved; u32 address; u32 global_system_interrupt_base; -} __attribute__((packed)); +} PACKED; struct madt_int_src_override_entry { struct madt_entry_header header; @@ -96,20 +96,20 @@ struct madt_int_src_override_entry { u8 irq_source; u32 global_system_interrupt; u16 flags; -} __attribute__((packed)); +} PACKED; struct madt_non_maskable_int_entry { struct madt_entry_header header; u8 processor_id; u16 flags; u8 lint_number; -} __attribute__((packed)); +} PACKED; struct madt_local_apic_override_entry { struct madt_entry_header header; u16 reserved; u64 address; -} __attribute__((packed)); +} PACKED; /** * FADT @@ -118,7 +118,7 @@ struct madt_local_apic_override_entry { struct fadt { struct sdt_header header; // TODO: FADT table (big!) -} __attribute__((packed)); +} PACKED; /** * HPET @@ -136,7 +136,7 @@ struct hpet { u8 hpet_number; u16 minimum_tick; u8 page_protection; -} __attribute__((packed)); +} PACKED; enum hpet_features { hpet_counter_size = 1 << 3, hpet_legacy_replacement_support = 1 << 5 }; enum hpet_config { hpet_enable = 1 << 0, hpet_legacy_replacement = 1 << 1 }; @@ -168,7 +168,7 @@ struct hpet_registers { u64 reserved5; u64 timer0; // enum hpet_timer u64 timer_comparator0; // In femtoseconds -} __attribute__((packed)); +} PACKED; /** * RSDP diff --git a/kernel/inc/fb.h b/kernel/inc/fb.h index 3b545fd..052f3d2 100644 --- a/kernel/inc/fb.h +++ b/kernel/inc/fb.h @@ -6,7 +6,7 @@ #include <boot.h> #include <mm.h> -void fb_map_buffer(struct page_dir *dir, struct vid_info *boot); -void fb_install(struct vid_info *boot); +void fb_map_buffer(struct page_dir *dir, struct vid_info *boot) NONNULL; +void fb_install(struct vid_info *boot) NONNULL; #endif diff --git a/kernel/inc/fs.h b/kernel/inc/fs.h index 4b333ac..b6c30a2 100644 --- a/kernel/inc/fs.h +++ b/kernel/inc/fs.h @@ -19,15 +19,16 @@ struct device { enum dev_type type; struct vfs *vfs; void *data; - res (*read)(void *buf, u32 offset, u32 count, struct device *dev); - res (*write)(void *buf, u32 offset, u32 count, struct device *dev); - res (*ioctl)(u32 request, void *arg1, void *arg2, void *arg3, struct device *dev); + res (*read)(void *buf, u32 offset, u32 count, struct device *dev) NONNULL; + res (*write)(void *buf, u32 offset, u32 count, struct device *dev) NONNULL; + res (*ioctl)(u32 request, void *arg1, void *arg2, void *arg3, struct device *dev) + ATTR((nonnull(5))); res (*ready)(void); }; void device_install(void); -void device_add(struct device *dev); +void device_add(struct device *dev) NONNULL; /** * VFS @@ -40,14 +41,15 @@ struct vfs { enum vfs_type type; int flags; void *data; - res (*read)(const char *path, void *buf, u32 offset, u32 count, struct device *dev); - res (*write)(const char *path, void *buf, u32 offset, u32 count, struct device *dev); + res (*read)(const char *path, void *buf, u32 offset, u32 count, struct device *dev) NONNULL; + res (*write)(const char *path, void *buf, u32 offset, u32 count, + struct device *dev) NONNULL; res (*ioctl)(const char *path, u32 request, void *arg1, void *arg2, void *arg3, - struct device *dev); - res (*stat)(const char *path, struct stat *buf, struct device *dev); - res (*wait)(const char *path, u32 func_ptr, struct device *dev); - res (*ready)(const char *path, struct device *dev); - res (*perm)(const char *path, enum vfs_perm perm, struct device *dev); + struct device *dev) ATTR((nonnull(1, 6))); + res (*stat)(const char *path, struct stat *buf, struct device *dev) NONNULL; + res (*wait)(const char *path, u32 func_ptr, struct device *dev) NONNULL; + res (*ready)(const char *path, struct device *dev) NONNULL; + res (*perm)(const char *path, enum vfs_perm perm, struct device *dev) NONNULL; }; struct mount_info { @@ -57,21 +59,21 @@ struct mount_info { void vfs_install(void); -u8 vfs_mounted(struct device *dev, const char *path); -res vfs_mount(struct device *dev, const char *path); +u8 vfs_mounted(struct device *dev, const char *path) NONNULL; +res vfs_mount(struct device *dev, const char *path) NONNULL; -struct device *vfs_find_dev(const char *path); +struct device *vfs_find_dev(const char *path) NONNULL; -res vfs_read(const char *path, void *buf, u32 offset, u32 count); -res vfs_write(const char *path, void *buf, u32 offset, u32 count); -res vfs_ioctl(const char *path, u32 request, void *arg1, void *arg2, void *arg3); -res vfs_stat(const char *path, struct stat *buf); -res vfs_wait(const char *path, u32 func_ptr); -res vfs_poll(const char **files); -res vfs_ready(const char *path); +res vfs_read(const char *path, void *buf, u32 offset, u32 count) NONNULL; +res vfs_write(const char *path, void *buf, u32 offset, u32 count) NONNULL; +res vfs_ioctl(const char *path, u32 request, void *arg1, void *arg2, void *arg3) ATTR((nonnull(1))); +res vfs_stat(const char *path, struct stat *buf) NONNULL; +res vfs_wait(const char *path, u32 func_ptr) NONNULL; +res vfs_poll(const char **files) NONNULL; +res vfs_ready(const char *path) NONNULL; -struct device *device_get_by_name(const char *name); -struct device *device_get_by_id(u32 id); +struct device *device_get_by_name(const char *name) NONNULL; +struct device *device_get_by_id(u32 id) NONNULL; /** * EXT2 @@ -175,9 +177,9 @@ struct ext2_file { u32 curr_block_pos; }; -res ext2_read(const char *path, void *buf, u32 offset, u32 count, struct device *dev); -res ext2_stat(const char *path, struct stat *buf, struct device *dev); -res ext2_perm(const char *path, enum vfs_perm perm, struct device *dev); -res ext2_ready(const char *path, struct device *dev); +res ext2_read(const char *path, void *buf, u32 offset, u32 count, struct device *dev) NONNULL; +res ext2_stat(const char *path, struct stat *buf, struct device *dev) NONNULL; +res ext2_perm(const char *path, enum vfs_perm perm, struct device *dev) NONNULL; +res ext2_ready(const char *path, struct device *dev) NONNULL; #endif diff --git a/kernel/inc/interrupts.h b/kernel/inc/interrupts.h index fc00402..a22bebb 100644 --- a/kernel/inc/interrupts.h +++ b/kernel/inc/interrupts.h @@ -18,21 +18,21 @@ struct idt_entry { u8 always0; // Always 0 u8 flags; u16 base_high; -} __attribute__((packed)); +} PACKED; struct idt_ptr { u16 limit; void *base; -} __attribute__((packed)); +} PACKED; void idt_set_gate(u8 num, u32 base, u16 sel, u8 flags); -void irq_install_handler(int irq, void (*handler)(struct regs *r)); +void irq_install_handler(int irq, void (*handler)(struct regs *r)) NONNULL; void irq_uninstall_handler(int irq); -void isr_install_handler(int isr, void (*handler)(struct regs *r)); +void isr_install_handler(int isr, void (*handler)(struct regs *r)) NONNULL; void isr_uninstall_handler(int isr); -void isr_panic(struct regs *r); +void isr_panic(struct regs *r) NONNULL; void interrupts_install(void); diff --git a/kernel/inc/load.h b/kernel/inc/load.h index 363a70f..365da79 100644 --- a/kernel/inc/load.h +++ b/kernel/inc/load.h @@ -105,6 +105,6 @@ struct elf_program { u32 align; }; -res elf_load(const char *path, struct proc *proc); +res elf_load(const char *path, struct proc *proc) NONNULL; #endif diff --git a/kernel/inc/mm.h b/kernel/inc/mm.h index ae4e962..fa9211c 100644 --- a/kernel/inc/mm.h +++ b/kernel/inc/mm.h @@ -18,7 +18,7 @@ struct memory_range { */ void paging_enable(void); -void page_fault_handler(struct regs *r); +void page_fault_handler(struct regs *r) NONNULL; /** * Physical @@ -81,14 +81,14 @@ struct page_dir { union page_dir_entry entries[PAGE_COUNT]; } PACKED; -u8 virtual_present(struct page_dir *dir, u32 vaddr); -u32 virtual_to_physical(struct page_dir *dir, u32 vaddr); -void virtual_map(struct page_dir *dir, struct memory_range prange, u32 vaddr, u32 flags); +u8 virtual_present(struct page_dir *dir, u32 vaddr) NONNULL; +u32 virtual_to_physical(struct page_dir *dir, u32 vaddr) NONNULL; +void virtual_map(struct page_dir *dir, struct memory_range prange, u32 vaddr, u32 flags) NONNULL; struct memory_range virtual_alloc(struct page_dir *dir, struct memory_range physical_range, - u32 flags); -void virtual_free(struct page_dir *dir, struct memory_range vrange); + u32 flags) NONNULL; +void virtual_free(struct page_dir *dir, struct memory_range vrange) NONNULL; struct page_dir *virtual_create_dir(void); -void virtual_destroy_dir(struct page_dir *dir); +void virtual_destroy_dir(struct page_dir *dir) NONNULL; struct page_dir *virtual_kernel_dir(void); /** @@ -103,24 +103,24 @@ struct page_dir *virtual_kernel_dir(void); struct memory_range memory_range_from(u32 base, u32 size); struct memory_range memory_range_around(u32 base, u32 size); -void *memory_alloc(struct page_dir *dir, u32 size, u32 flags); -void *memory_alloc_identity(struct page_dir *dir, u32 flags); -void memory_free(struct page_dir *dir, struct memory_range vrange); -void memory_map_identity(struct page_dir *dir, struct memory_range prange, u32 flags); -void memory_switch_dir(struct page_dir *dir); -void memory_backup_dir(struct page_dir **backup); +void *memory_alloc(struct page_dir *dir, u32 size, u32 flags) NONNULL; +void *memory_alloc_identity(struct page_dir *dir, u32 flags) NONNULL; +void memory_free(struct page_dir *dir, struct memory_range vrange) NONNULL; +void memory_map_identity(struct page_dir *dir, struct memory_range prange, u32 flags) NONNULL; +void memory_switch_dir(struct page_dir *dir) NONNULL; +void memory_backup_dir(struct page_dir **backup) NONNULL; // Bypass should almost never be used void memory_bypass_enable(void); void memory_bypass_disable(void); u8 memory_is_user(u32 addr); -u8 memory_valid(const void *addr); +u8 memory_valid(const void *addr) NONNULL; // User interface -res memory_sys_alloc(struct page_dir *dir, u32 size, u32 *addr, u32 *id, u8 shared); -res memory_sys_free(struct page_dir *dir, u32 addr); -res memory_sys_shaccess(struct page_dir *dir, u32 id, u32 *addr, u32 *size); +res memory_sys_alloc(struct page_dir *dir, u32 size, u32 *addr, u32 *id, u8 shared) NONNULL; +res memory_sys_free(struct page_dir *dir, u32 addr) NONNULL; +res memory_sys_shaccess(struct page_dir *dir, u32 id, u32 *addr, u32 *size) NONNULL; -void memory_install(struct mem_info *mem_info, struct vid_info *vid_info); +void memory_install(struct mem_info *mem_info, struct vid_info *vid_info) NONNULL; #endif diff --git a/kernel/inc/net.h b/kernel/inc/net.h index 2852328..62ff5e5 100644 --- a/kernel/inc/net.h +++ b/kernel/inc/net.h @@ -53,7 +53,7 @@ struct ethernet_packet { u8 src[6]; u16 type; u8 data[]; -} __attribute__((packed)); +} PACKED; struct arp_packet { u16 hardware_type; @@ -65,7 +65,7 @@ struct arp_packet { u32 src_protocol_addr; u8 dst_mac[6]; u32 dst_protocol_addr; -} __attribute__((packed)); +} PACKED; struct ip_packet { u8 version_ihl; @@ -79,7 +79,7 @@ struct ip_packet { u32 src; u32 dst; u8 data[]; -} __attribute__((packed)); +} PACKED; struct dhcp_packet { u8 op; @@ -98,7 +98,7 @@ struct dhcp_packet { u8 server_name[64]; u8 file[128]; u8 options[64]; -} __attribute__((packed)); +} PACKED; struct dns_packet { u16 qid; @@ -108,7 +108,7 @@ struct dns_packet { u16 authorities; u16 additional; u8 data[]; -} __attribute__((packed)); +} PACKED; struct udp_packet { u16 src_port; @@ -116,7 +116,7 @@ struct udp_packet { u16 length; u16 checksum; u8 data[]; -} __attribute__((packed)); +} PACKED; struct tcp_packet { u16 src_port; @@ -128,7 +128,7 @@ struct tcp_packet { u16 checksum; u16 urgent; u8 data[]; -} __attribute__((packed)); +} PACKED; struct tcp_pseudo_header { u32 src; @@ -145,7 +145,7 @@ struct icmp_packet { u16 checksum; u16 identifier; u16 sequence; -} __attribute__((packed)); +} PACKED; // Other structs @@ -154,13 +154,13 @@ struct arp_table_entry { u64 mac_addr; }; -void ethernet_handle_packet(struct ethernet_packet *packet, int len); +void ethernet_handle_packet(struct ethernet_packet *packet, int len) NONNULL; struct socket *net_open(enum socket_type type); -int net_close(struct socket *socket); -int net_connect(struct socket *socket, u32 ip_addr, u16 dst_port); -void net_send(struct socket *socket, void *data, u32 len); -int net_receive(struct socket *socket, void *buf, u32 len); +int net_close(struct socket *socket) NONNULL; +int net_connect(struct socket *socket, u32 ip_addr, u16 dst_port) NONNULL; +void net_send(struct socket *socket, void *data, u32 len) NONNULL; +int net_receive(struct socket *socket, void *buf, u32 len) NONNULL; int net_installed(void); void net_install(void); diff --git a/kernel/inc/pci.h b/kernel/inc/pci.h index 11fad6f..9429f29 100644 --- a/kernel/inc/pci.h +++ b/kernel/inc/pci.h @@ -91,11 +91,11 @@ static inline u32 pci_box_device(int bus, int slot, int func) u32 pci_read_field(u32 device, int field, int size); void pci_write_field(u32 device, int field, u32 value); u16 pci_find_type(u32 dev); -void pci_scan_hit(pci_func_t f, u32 dev, void *extra); -void pci_scan_func(pci_func_t f, int type, int bus, int slot, int func, void *extra); -void pci_scan_slot(pci_func_t f, int type, int bus, int slot, void *extra); -void pci_scan_bus(pci_func_t f, int type, int bus, void *extra); -void pci_scan(pci_func_t f, int type, void *extra); +void pci_scan_hit(pci_func_t f, u32 dev, void *extra) NONNULL; +void pci_scan_func(pci_func_t f, int type, int bus, int slot, int func, void *extra) NONNULL; +void pci_scan_slot(pci_func_t f, int type, int bus, int slot, void *extra) NONNULL; +void pci_scan_bus(pci_func_t f, int type, int bus, void *extra) NONNULL; +void pci_scan(pci_func_t f, int type, void *extra) NONNULL; int pci_get_interrupt(u32 device); void pci_install(void); diff --git a/kernel/inc/proc.h b/kernel/inc/proc.h index 71d1284..8a68131 100644 --- a/kernel/inc/proc.h +++ b/kernel/inc/proc.h @@ -61,18 +61,18 @@ struct proc { struct list *memory; }; -void scheduler(struct regs *regs); +void scheduler(struct regs *regs) NONNULL; void proc_init(void); void proc_print(void); struct proc *proc_current(void); u8 proc_super(void); struct proc *proc_from_pid(u32 pid); -void proc_exit(struct proc *proc, s32 status); -void proc_yield(struct regs *r); +void proc_exit(struct proc *proc, s32 status) NONNULL; +void proc_yield(struct regs *r) NONNULL; void proc_clear_quantum(void); void proc_enable_waiting(u32 id, enum proc_wait_type type); void proc_wait_for(u32 id, enum proc_wait_type type, u32 func_ptr); struct proc *proc_make(enum proc_priv priv); -void proc_stack_push(struct proc *proc, u32 data); +void proc_stack_push(struct proc *proc, u32 data) NONNULL; #endif diff --git a/kernel/inc/rtl8139.h b/kernel/inc/rtl8139.h index bbb904e..0d748af 100644 --- a/kernel/inc/rtl8139.h +++ b/kernel/inc/rtl8139.h @@ -30,7 +30,7 @@ int rtl8139_install(void); int rtl8139_installed(void); -void rtl8139_send_packet(void *data, u32 len); +void rtl8139_send_packet(void *data, u32 len) NONNULL; u8 *rtl8139_get_mac(void); #endif diff --git a/kernel/inc/serial.h b/kernel/inc/serial.h index 7ca5ac2..e96316a 100644 --- a/kernel/inc/serial.h +++ b/kernel/inc/serial.h @@ -3,8 +3,10 @@ #ifndef SERIAL_H #define SERIAL_H +#include <def.h> + void serial_install(void); -void serial_print(const char *data); +void serial_print(const char *data) NONNULL; void serial_put(char ch); #endif diff --git a/kernel/inc/timer.h b/kernel/inc/timer.h index 5d747d0..0712e37 100644 --- a/kernel/inc/timer.h +++ b/kernel/inc/timer.h @@ -9,7 +9,7 @@ u32 timer_get(void); void timer_wait(u32 ticks); void timer_install(void); -void timer_handler(struct regs *r); +void timer_handler(struct regs *r) NONNULL; void scheduler_enable(void); void scheduler_disable(void); diff --git a/libs/libc/alloc.c b/libs/libc/alloc.c index b8139d0..485a60f 100644 --- a/libs/libc/alloc.c +++ b/libs/libc/alloc.c @@ -414,8 +414,7 @@ void *malloc_debug(u32 size, const char *file, int line, const char *func, const void free_debug(void *ptr, const char *file, int line, const char *func, const char *inp) { - if (ptr) - _free(ptr); + _free(ptr); (void)file; (void)line; diff --git a/libs/libc/conv.c b/libs/libc/conv.c index 670fdb3..bb68d7b 100644 --- a/libs/libc/conv.c +++ b/libs/libc/conv.c @@ -105,7 +105,7 @@ char *itoa(int n) if (negative) { char *aux = (char *)malloc((u32)(sz + 2)); - strcpy(aux, ret); + strlcpy(aux, ret, sz + 2); aux[sz] = '-'; aux[sz + 1] = 0; free(ret); diff --git a/libs/libc/cpu.c b/libs/libc/cpu.c index 8ca4d27..37bdb4d 100644 --- a/libs/libc/cpu.c +++ b/libs/libc/cpu.c @@ -124,7 +124,7 @@ static void fpu_handler(struct regs *r) __asm__ volatile("clts"); } -static u8 fpu_state[512] __attribute__((aligned(16))); +static u8 fpu_state[512] ALIGNED(16); void fpu_restore(void) { __asm__ volatile("fxrstor (%0)" ::"r"(fpu_state)); diff --git a/libs/libc/inc/conv.h b/libs/libc/inc/conv.h index adf9003..95f7d02 100644 --- a/libs/libc/inc/conv.h +++ b/libs/libc/inc/conv.h @@ -5,11 +5,11 @@ #include <def.h> -int atoi(const char *str); +int atoi(const char *str) NONNULL; char *htoa(u32 n); -int htoi(const char *str); +int htoi(const char *str) NONNULL; char *itoa(int n); -char *conv_base(int value, char *result, int base, int is_signed); +char *conv_base(int value, char *result, int base, int is_signed) NONNULL; #endif diff --git a/libs/libc/inc/cpu.h b/libs/libc/inc/cpu.h index d709d86..f96fa58 100644 --- a/libs/libc/inc/cpu.h +++ b/libs/libc/inc/cpu.h @@ -8,7 +8,7 @@ u8 inb(u16 port); u16 inw(u16 port); u32 inl(u16 port); -void insl(u16 port, void *addr, int n); +void insl(u16 port, void *addr, int n) ATTR((nonnull(2))); void outb(u16 port, u8 data); void outw(u16 port, u16 data); diff --git a/libs/libc/inc/crypto.h b/libs/libc/inc/crypto.h index bbe8d7e..16cdf86 100644 --- a/libs/libc/inc/crypto.h +++ b/libs/libc/inc/crypto.h @@ -5,7 +5,7 @@ #include <def.h> -void md5(const void *initial_msg, u32 initial_len, u8 digest[16]); -u32 crc32(u32 crc, const void *buf, u32 size); +void md5(const void *initial_msg, u32 initial_len, u8 digest[16]) NONNULL; +u32 crc32(u32 crc, const void *buf, u32 size) NONNULL; #endif diff --git a/libs/libc/inc/def.h b/libs/libc/inc/def.h index e71c502..378a4d0 100644 --- a/libs/libc/inc/def.h +++ b/libs/libc/inc/def.h @@ -30,11 +30,17 @@ typedef unsigned long long u64; #define ABS(a) ((u32)(((s32)(a) < 0) ? (-a) : (a))) -#define NORETURN __attribute__((noreturn)) -#define DEPRECATED __attribute__((deprecated)) -#define NO_SANITIZE __attribute__((no_sanitize("undefined"))) -#define PACKED __attribute__((packed)) -#define ALIGNED(align) __attribute__((aligned(align))) +#define ATTR __attribute__ +#define NORETURN ATTR((noreturn)) +#define DEPRECATED ATTR((deprecated)) +#define NONNULL ATTR((nonnull)) +#define PURE ATTR((pure)) +#define CONST ATTR((const)) +#define FLATTEN ATTR((flatten)) +#define PACKED ATTR((packed)) +#define HOT ATTR((hot)) +#define ALIGNED(align) ATTR((aligned(align))) +#define NO_SANITIZE ATTR((no_sanitize("undefined"))) #define EOF (-1) #define NULL ((void *)0) diff --git a/libs/libc/inc/list.h b/libs/libc/inc/list.h index 0b82b48..fea98dc 100644 --- a/libs/libc/inc/list.h +++ b/libs/libc/inc/list.h @@ -17,13 +17,13 @@ struct node { }; struct list *list_new(void); -void list_destroy(struct list *list); +void list_destroy(struct list *list) NONNULL; /* struct node *list_new_node(); */ // TODO: Make node-specific things static/private? /* void list_add_node(struct list *list, struct node *node); */ -struct node *list_add(struct list *list, void *data); -struct list *list_remove(struct list *list, struct node *node); -struct node *list_last(struct list *list); -struct list *list_swap(struct list *list, struct node *a, struct node *b); -struct node *list_first_data(struct list *list, void *data); +struct node *list_add(struct list *list, void *data) NONNULL; +struct list *list_remove(struct list *list, struct node *node) NONNULL; +struct node *list_last(struct list *list) NONNULL; +struct list *list_swap(struct list *list, struct node *a, struct node *b) NONNULL; +struct node *list_first_data(struct list *list, void *data) NONNULL; #endif diff --git a/libs/libc/inc/mem.h b/libs/libc/inc/mem.h index ec00628..2d55eff 100644 --- a/libs/libc/inc/mem.h +++ b/libs/libc/inc/mem.h @@ -5,8 +5,8 @@ #include <def.h> -void *malloc_debug(u32 size, const char *file, int line, const char *func, const char *inp); -void free_debug(void *ptr, const char *file, int line, const char *func, const char *inp); +void *malloc_debug(u32 size, const char *file, int line, const char *func, const char *inp) NONNULL; +void free_debug(void *ptr, const char *file, int line, const char *func, const char *inp) NONNULL; #define malloc(size) malloc_debug((u32)(size), __FILE__, __LINE__, __func__, #size) #define free(ptr) free_debug((void *)(ptr), __FILE__, __LINE__, __func__, #ptr) void *realloc(void *ptr, u32 size); @@ -20,10 +20,10 @@ void *zalloc(u32 size); #error "No lib target specified. Please use -Dkernel or -Duserspace" #endif -void *memcpy(void *dest, const void *src, u32 n); -void *memset(void *dest, int val, u32 n); -void *memchr(void *src, int c, u32 n); -int memcmp(const void *s1, const void *s2, u32 n); -int mememp(const u8 *buf, u32 n); +void *memcpy(void *dest, const void *src, u32 n) NONNULL; +void *memset(void *dest, u32 val, u32 n) NONNULL; +void *memchr(void *src, char c, u32 n) NONNULL; +int memcmp(const void *s1, const void *s2, u32 n) NONNULL; +int mememp(const u8 *buf, u32 n) NONNULL; #endif diff --git a/libs/libc/inc/print.h b/libs/libc/inc/print.h index 58b5dc6..751a929 100644 --- a/libs/libc/inc/print.h +++ b/libs/libc/inc/print.h @@ -3,24 +3,24 @@ #ifndef PRINT_H #define PRINT_H -#include "arg.h" +#include <arg.h> #include <def.h> -int printf(const char *format, ...); -int vprintf(const char *format, va_list ap); -int sprintf(char *str, const char *format, ...); -int vsprintf(char *str, const char *format, va_list ap); -int print(const char *str); -NORETURN void panic(const char *format, ...); +int printf(const char *format, ...) NONNULL; +int vprintf(const char *format, va_list ap) NONNULL; +int snprintf(char *str, u32 size, const char *format, ...) NONNULL; +int vsnprintf(char *str, u32 size, const char *format, va_list ap) NONNULL; +int print(const char *str) NONNULL; +NORETURN void panic(const char *format, ...) NONNULL; #ifdef userspace -int vfprintf(const char *path, const char *format, va_list ap); -int fprintf(const char *path, const char *format, ...); -int log(const char *format, ...); -int err(int code, const char *format, ...); +int vfprintf(const char *path, const char *format, va_list ap) NONNULL; +int fprintf(const char *path, const char *format, ...) NONNULL; +int log(const char *format, ...) NONNULL; +int err(int code, const char *format, ...) NONNULL; #else #include <proc.h> -int print_app(enum stream_defaults id, const char *proc_name, const char *str); +int print_app(enum stream_defaults id, const char *proc_name, const char *str) NONNULL; void print_trace(u32 count); #endif diff --git a/libs/libc/inc/stack.h b/libs/libc/inc/stack.h index f5ad52b..54d1918 100644 --- a/libs/libc/inc/stack.h +++ b/libs/libc/inc/stack.h @@ -17,12 +17,12 @@ struct stack { }; struct stack *stack_new(void); -void stack_destroy(struct stack *stack); -u32 stack_empty(struct stack *stack); -u32 stack_push_bot(struct stack *stack, void *data); -u32 stack_push(struct stack *stack, void *data); -void *stack_pop(struct stack *stack); -void *stack_peek(struct stack *stack); -void stack_clear(struct stack *stack); +void stack_destroy(struct stack *stack) NONNULL; +u32 stack_empty(struct stack *stack) NONNULL; +u32 stack_push_bot(struct stack *stack, void *data) NONNULL; +u32 stack_push(struct stack *stack, void *data) NONNULL; +void *stack_pop(struct stack *stack) NONNULL; +void *stack_peek(struct stack *stack) NONNULL; +void stack_clear(struct stack *stack) NONNULL; #endif diff --git a/libs/libc/inc/str.h b/libs/libc/inc/str.h index d0a521f..e77eeee 100644 --- a/libs/libc/inc/str.h +++ b/libs/libc/inc/str.h @@ -5,17 +5,15 @@ #include <def.h> -u32 strlen(const char *s); -char *strcpy(char *dst, const char *src); -char *strncpy(char *dst, const char *src, u32 n); -char *strchr(char *s, int c); -char *strrchr(char *s, int c); -char *strcat(char *dst, const char *src); -char *strncat(char *dst, const char *src, u32 n); -int strcmp(const char *s1, const char *s2); -int strncmp(const char *s1, const char *s2, u32 n); -char *strinv(char *s); -char *strdup(const char *s); +u32 strlen(const char *s) NONNULL; +u32 strlcpy(char *dst, const char *src, u32 size) NONNULL; +char *strchr(char *s, int c) NONNULL; +char *strrchr(char *s, int c) NONNULL; +u32 strlcat(char *dst, const char *src, u32 size) NONNULL; +int strcmp(const char *s1, const char *s2) NONNULL; +int strncmp(const char *s1, const char *s2, u32 n) NONNULL; +char *strinv(char *s) NONNULL; +char *strdup(const char *s) NONNULL; const char *strerror(u32 err); diff --git a/libs/libc/inc/sys.h b/libs/libc/inc/sys.h index 19fb3ee..b555998 100644 --- a/libs/libc/inc/sys.h +++ b/libs/libc/inc/sys.h @@ -67,20 +67,20 @@ struct stat { void loop(void); void exit(s32 status); -res read(const char *path, void *buf, u32 offset, u32 count); -res write(const char *path, const void *buf, u32 offset, u32 count); -res ioctl(const char *path, ...); -res stat(const char *path, struct stat *buf); -res poll(const char **files); -res exec(const char *path, ...); +res read(const char *path, void *buf, u32 offset, u32 count) NONNULL; +res write(const char *path, const void *buf, u32 offset, u32 count) NONNULL; +res ioctl(const char *path, ...) NONNULL; +res stat(const char *path, struct stat *buf) NONNULL; +res poll(const char **files) NONNULL; +res exec(const char *path, ...) ATTR((nonnull(1))); res yield(void); res boot(u32 cmd); u32 time(void); -res sys_alloc(u32 size, u32 *addr); -res sys_free(void *ptr); -res shalloc(u32 size, u32 *addr, u32 *id); -res shaccess(u32 id, u32 *addr, u32 *size); +res sys_alloc(u32 size, u32 *addr) NONNULL; +res sys_free(void *ptr) NONNULL; +res shalloc(u32 size, u32 *addr, u32 *id) NONNULL; +res shaccess(u32 id, u32 *addr, u32 *size) NONNULL; static inline u32 getpid(void) { @@ -93,12 +93,13 @@ static inline u32 getpid(void) #include <print.h> #include <str.h> -static inline u32 pidof(const char *name) +NONNULL static inline u32 pidof(const char *name) { u32 curr = 1; char buf[32] = { 0 }, path[32] = { 0 }; while (curr < 1000) { // Max pid?? - if (sprintf(path, "/proc/%d/name", curr) > 0 && read(path, buf, 0, 32) > 0) + if (snprintf(path, sizeof(buf), "/proc/%d/name", curr) > 0 && + read(path, buf, 0, 32) > 0) if (!strcmp(name, buf)) return curr; @@ -110,7 +111,7 @@ static inline u32 pidof(const char *name) // Simple read wrapper #include <mem.h> -static inline void *sread(const char *path) +NONNULL static inline void *sread(const char *path) { struct stat s = { 0 }; if (stat(path, &s) != 0 || !s.size) diff --git a/libs/libc/list.c b/libs/libc/list.c index c86b23d..1fc9a55 100644 --- a/libs/libc/list.c +++ b/libs/libc/list.c @@ -15,8 +15,6 @@ struct list *list_new(void) void list_destroy(struct list *list) { - if (!list) - return; struct node *iterator = list->head; while (iterator != NULL) { if (iterator->next == NULL) { @@ -41,11 +39,8 @@ static struct node *list_new_node(void) return node; } -static struct node *list_add_node(struct list *list, struct node *node) +NONNULL static struct node *list_add_node(struct list *list, struct node *node) { - if (!list || !node) - return NULL; - if (list->head == NULL) { list->head = node; return list->head; @@ -65,7 +60,7 @@ static struct node *list_add_node(struct list *list, struct node *node) struct node *list_last(struct list *list) { - if (!list || !list->head) + if (list->head) return NULL; struct node *iterator = list->head; @@ -80,7 +75,7 @@ struct node *list_last(struct list *list) struct node *list_first_data(struct list *list, void *data) { - if (!list || !list->head || !data) + if (!list->head) return NULL; struct node *iterator = list->head; @@ -96,7 +91,7 @@ struct node *list_first_data(struct list *list, void *data) // TODO: Actually swap the nodes, not the data struct list *list_swap(struct list *list, struct node *a, struct node *b) { - if (!list || !list->head || !a || !b) + if (!list->head) return NULL; void *tmp = a->data; @@ -116,7 +111,7 @@ struct node *list_add(struct list *list, void *data) // Maybe list_remove_node? struct list *list_remove(struct list *list, struct node *node) { - if (!list || !list->head || !node) + if (!list->head) return NULL; if (list->head == node) { diff --git a/libs/libc/mem.c b/libs/libc/mem.c index 95242e4..2e457ef 100644 --- a/libs/libc/mem.c +++ b/libs/libc/mem.c @@ -64,7 +64,7 @@ void *memcpy(void *dest, const void *src, u32 n) #endif } -void *memset(void *dest, int val, u32 n) +void *memset(void *dest, u32 val, u32 n) { u32 uval = val; u32 num_dwords = n / 4; @@ -90,7 +90,7 @@ void *memset(void *dest, int val, u32 n) return dest; } -void *memchr(void *src, int c, u32 n) +void *memchr(void *src, char c, u32 n) { u8 *s = (u8 *)src; diff --git a/libs/libc/print.c b/libs/libc/print.c index 2422fed..7c19628 100644 --- a/libs/libc/print.c +++ b/libs/libc/print.c @@ -15,13 +15,15 @@ static void append(char *dest, char *src, int index) dest[index + strlen(src)] = 0; } -int vsprintf(char *str, const char *format, va_list ap) +int vsnprintf(char *str, u32 size, const char *format, va_list ap) { u8 ready_to_format = 0; - int i = 0; + u32 i = 0; char buf = 0; - char format_buffer[20] = { '\0' }; + + // TODO: Fix format buffer overflow exploit + char format_buffer[42] = { 0 }; for (; *format; format++) { if (ready_to_format) { @@ -71,21 +73,24 @@ int vsprintf(char *str, const char *format, va_list ap) ready_to_format = 1; else { str[i] = *format; - i++; + if (++i == size) { + str[i] = 0; + break; + } } } - format_buffer[0] = '\0'; + memset(format_buffer, 0, sizeof(format_buffer)); } return strlen(str); } -int sprintf(char *str, const char *format, ...) +int snprintf(char *str, u32 size, const char *format, ...) { va_list ap; va_start(ap, format); - int len = vsprintf(str, format, ap); + int len = vsnprintf(str, size, format, ap); va_end(ap); return len; @@ -106,7 +111,7 @@ int vprintf(const char *format, va_list ap) int vfprintf(const char *path, const char *format, va_list ap) { char buf[1024] = { 0 }; - int len = vsprintf(buf, format, ap); + int len = vsnprintf(buf, sizeof(buf), format, ap); return write(path, buf, 0, len); } @@ -185,7 +190,7 @@ static void print_kernel(const char *str) int vprintf(const char *format, va_list ap) { char buf[1024] = { 0 }; - int len = vsprintf(buf, format, ap); + int len = vsnprintf(buf, sizeof(buf), format, ap); print_kernel(buf); return len; } @@ -242,7 +247,7 @@ NORETURN void panic(const char *format, ...) char buf[1024] = { 0 }; va_list ap; va_start(ap, format); - vsprintf(buf, format, ap); + vsnprintf(buf, sizeof(buf), format, ap); va_end(ap); #ifdef kernel print("--- DON'T PANIC! ---\n"); diff --git a/libs/libc/sanitize.c b/libs/libc/sanitize.c index 39ab44f..415b790 100644 --- a/libs/libc/sanitize.c +++ b/libs/libc/sanitize.c @@ -49,6 +49,12 @@ struct type_mismatch { u8 type_check_kind; }; +struct nonnull_arg { + struct source_location location; + struct source_location attribute_location; + u32 index; +}; + struct overflow { struct source_location location; struct type_descriptor *type; @@ -66,16 +72,18 @@ void __ubsan_handle_load_invalid_value(void) panic("UBSAN: load-invalid-value\n"); } -void __ubsan_handle_nonnull_arg(void); -void __ubsan_handle_nonnull_arg(void) +void __ubsan_handle_nonnull_arg(struct nonnull_arg *data); +void __ubsan_handle_nonnull_arg(struct nonnull_arg *data) { - panic("UBSAN: nonnull-arg\n"); + struct source_location *loc = &data->location; + panic("%s:%d: UBSAN: nonnull-arg [index: %d]\n", loc->file, loc->line, data->index); } -void __ubsan_handle_nullability_arg(void); -void __ubsan_handle_nullability_arg(void) +void __ubsan_handle_nullability_arg(struct nonnull_arg *data); +void __ubsan_handle_nullability_arg(struct nonnull_arg *data) { - panic("UBSAN: nullability-arg\n"); + struct source_location *loc = &data->location; + panic("%s:%d: UBSAN: nonnull-arg [index: %d]\n", loc->file, loc->line, data->index); } void __ubsan_handle_nonnull_return_v1(void); diff --git a/libs/libc/stack.c b/libs/libc/stack.c index 0cbb69d..6f16709 100644 --- a/libs/libc/stack.c +++ b/libs/libc/stack.c @@ -39,11 +39,8 @@ static struct stack_node *stack_new_node(void) return node; } -static u32 stack_push_bot_node(struct stack *stack, struct stack_node *node) +NONNULL static u32 stack_push_bot_node(struct stack *stack, struct stack_node *node) { - if (!stack || !node) - return 0; - if (stack->tail) { struct stack_node *iterator = stack->tail; while (iterator) { @@ -60,11 +57,8 @@ static u32 stack_push_bot_node(struct stack *stack, struct stack_node *node) return 1; } -static u32 stack_push_node(struct stack *stack, struct stack_node *node) +NONNULL static u32 stack_push_node(struct stack *stack, struct stack_node *node) { - if (!stack || !node) - return 0; - if (stack->tail) { stack->tail->next = node; node->prev = stack->tail; @@ -97,7 +91,7 @@ u32 stack_push(struct stack *stack, void *data) void *stack_pop(struct stack *stack) { - if (!stack || !stack->tail) + if (!stack->tail) return NULL; struct stack_node *prev = stack->tail; @@ -113,7 +107,7 @@ void *stack_pop(struct stack *stack) void *stack_peek(struct stack *stack) { - if (!stack || !stack->tail) + if (!stack->tail) return NULL; return stack->tail->data; diff --git a/libs/libc/str.c b/libs/libc/str.c index ba16920..3bc3aaf 100644 --- a/libs/libc/str.c +++ b/libs/libc/str.c @@ -5,35 +5,32 @@ #include <mem.h> #include <str.h> -u32 strlen(const char *s) +u32 strlen(const char *str) { - const char *ss = s; - while (*ss) - ss++; - return ss - s; -} - -char *strcpy(char *dst, const char *src) -{ - char *q = dst; - const char *p = src; - char ch; - - do { - *q++ = ch = *p++; - } while (ch); - - return dst; + const char *s = str; + while (*s) + s++; + return s - str; } -char *strncpy(char *dst, const char *src, u32 n) +u32 strlcpy(char *dst, const char *src, u32 size) { - char *q = dst; - - while (n-- && (*dst++ = *src++)) - ; + const char *orig = src; + u32 left = size; + + if (left) + while (--left) + if (!(*dst++ = *src++)) + break; + + if (!left) { + if (!size) + *dst = 0; + while (*src++) + ; + } - return q; + return src - orig - 1; } int strcmp(const char *s1, const char *s2) @@ -91,16 +88,32 @@ char *strrchr(char *s, int c) return ret; } -char *strcat(char *dst, const char *src) +u32 strlcat(char *dst, const char *src, u32 size) { - strcpy(strchr(dst, '\0'), src); - return dst; -} + const char *orig_dst = dst; + const char *orig_src = src; -char *strncat(char *dst, const char *src, u32 n) -{ - strncpy(strchr(dst, '\0'), src, n); - return dst; + u32 n = size; + while (n-- && *dst) + dst++; + + u32 len = dst - orig_dst; + n = size - len; + + if (!n--) + return len + strlen(src); + + while (*src) { + if (n) { + *dst++ = *src; + n--; + } + src++; + } + + src = 0; + + return len + (src - orig_src); } char *strinv(char *s) diff --git a/libs/libgui/bmp.h b/libs/libgui/bmp.h index ff8360b..f7fb57f 100644 --- a/libs/libgui/bmp.h +++ b/libs/libgui/bmp.h @@ -11,7 +11,7 @@ struct bmp_header { u32 size; u32 reserved; u32 offset; -} __attribute__((packed)); +} PACKED; struct bmp_info { u32 size; @@ -34,6 +34,6 @@ struct bmp { u32 pitch; }; -struct bmp *bmp_load(const char *path); +struct bmp *bmp_load(const char *path) NONNULL; #endif diff --git a/libs/libgui/gfx.h b/libs/libgui/gfx.h index 83736fd..082fe07 100644 --- a/libs/libgui/gfx.h +++ b/libs/libgui/gfx.h @@ -66,18 +66,21 @@ struct context { u32 bytes; }; -struct context *gfx_new_ctx(struct context *ctx, vec2 size, u8 bpp); +struct context *gfx_new_ctx(struct context *ctx, vec2 size, u8 bpp) NONNULL; struct font *gfx_resolve_font(enum font_type font_type); -void gfx_write_char(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, char ch); -void gfx_write(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, const char *text); -void gfx_load_image(struct context *ctx, vec2 pos, const char *path); -void gfx_load_image_filter(struct context *ctx, vec2 pos, enum gfx_filter filter, const char *path); -void gfx_load_wallpaper(struct context *ctx, const char *path); -void gfx_copy(struct context *dest, struct context *src, vec2 pos, vec2 size); -void gfx_ctx_on_ctx(struct context *dest, struct context *src, vec2 pos); -void gfx_draw_rectangle(struct context *ctx, vec2 pos1, vec2 pos2, u32 c); -void gfx_fill(struct context *ctx, u32 c); -void gfx_border(struct context *ctx, u32 c, u32 width); +void gfx_write_char(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, + char ch) NONNULL; +void gfx_write(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, + const char *text) NONNULL; +void gfx_load_image(struct context *ctx, vec2 pos, const char *path) NONNULL; +void gfx_load_image_filter(struct context *ctx, vec2 pos, enum gfx_filter filter, + const char *path) NONNULL; +void gfx_load_wallpaper(struct context *ctx, const char *path) NONNULL; +void gfx_copy(struct context *dest, struct context *src, vec2 pos, vec2 size) NONNULL; +void gfx_ctx_on_ctx(struct context *dest, struct context *src, vec2 pos) NONNULL; +void gfx_draw_rectangle(struct context *ctx, vec2 pos1, vec2 pos2, u32 c) NONNULL; +void gfx_fill(struct context *ctx, u32 c) NONNULL; +void gfx_border(struct context *ctx, u32 c, u32 width) NONNULL; int gfx_font_height(enum font_type); int gfx_font_width(enum font_type); diff --git a/libs/libgui/gui.h b/libs/libgui/gui.h index 5190155..f4c213b 100644 --- a/libs/libgui/gui.h +++ b/libs/libgui/gui.h @@ -23,9 +23,9 @@ res gui_redraw_window(u32 id); res gui_fill(u32 win_id, u32 widget_id, enum gui_layer layer, u32 c); res gui_load_image(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size, - const char *path); + const char *path) NONNULL; res gui_load_image_filter(u32 win_id, u32 widget_id, enum gui_layer layer, vec2 pos, vec2 size, - enum gfx_filter filter, const char *path); + enum gfx_filter filter, const char *path) NONNULL; res gui_add_widget(u32 win_id, u32 widget_id, vec2 size, vec2 pos); res gui_new_widget(u32 win_id, vec2 size, vec2 pos); diff --git a/libs/libgui/msg.c b/libs/libgui/msg.c index 73af242..051072e 100644 --- a/libs/libgui/msg.c +++ b/libs/libgui/msg.c @@ -8,11 +8,9 @@ res msg_send(u32 pid, enum message_type type, void *data, u32 size) { - if (!data) - return -EFAULT; assert((signed)pid != -1 && size >= sizeof(struct message_header)); char path[32] = { 0 }; - sprintf(path, "/proc/%d/msg", pid); + snprintf(path, sizeof(path), "/proc/%d/msg", pid); struct message_header *header = data; header->magic = MSG_MAGIC; header->src = getpid(); diff --git a/libs/libgui/msg.h b/libs/libgui/msg.h index 65fc640..c25e95e 100644 --- a/libs/libgui/msg.h +++ b/libs/libgui/msg.h @@ -66,7 +66,7 @@ enum message_type { GUI_KEYBOARD, }; -res msg_send(u32 pid, enum message_type type, void *data, u32 size); -res msg_receive(void *buf, u32 size); +res msg_send(u32 pid, enum message_type type, void *data, u32 size) NONNULL; +res msg_receive(void *buf, u32 size) NONNULL; #endif diff --git a/libs/libgui/png.c b/libs/libgui/png.c index 6f8f4b5..2ff3340 100644 --- a/libs/libgui/png.c +++ b/libs/libgui/png.c @@ -90,7 +90,8 @@ static void *png_realloc(void *ptr, u32 new_size) static void png_free(void *ptr) { - free(ptr); + if (ptr) + free(ptr); } #else /*PNG_COMPILE_ALLOCATORS*/ /* TODO: support giving additional void* payload to the custom allocators */ diff --git a/libs/libgui/psf.c b/libs/libgui/psf.c index e28c2d7..751421a 100644 --- a/libs/libgui/psf.c +++ b/libs/libgui/psf.c @@ -25,9 +25,6 @@ static int psf_verify(char *data) struct font *psf_parse(char *data) { - if (!data) - return NULL; - int version = psf_verify(data); char *chars; diff --git a/libs/libgui/psf.h b/libs/libgui/psf.h index 63a3d1e..4d63118 100644 --- a/libs/libgui/psf.h +++ b/libs/libgui/psf.h @@ -43,6 +43,6 @@ struct psf2_header { u32 width; }; -struct font *psf_parse(char *data); +struct font *psf_parse(char *data) NONNULL; #endif diff --git a/libs/libnet/dns.c b/libs/libnet/dns.c index f20f33a..e179bd6 100644 --- a/libs/libnet/dns.c +++ b/libs/libnet/dns.c @@ -20,7 +20,7 @@ struct dns_packet { u16 authorities; u16 additional; u8 data[]; -} __attribute__((packed)); +} PACKED; static u32 part_count(const char *name) { diff --git a/libs/libtxt/html.h b/libs/libtxt/html.h index c1b29f2..ea2cfb8 100644 --- a/libs/libtxt/html.h +++ b/libs/libtxt/html.h @@ -21,6 +21,6 @@ struct html_element { struct element *obj; }; -int html_render(struct element *container, char *data, u32 length); +int html_render(struct element *container, char *data, u32 length) NONNULL; #endif diff --git a/libs/libtxt/keymap.h b/libs/libtxt/keymap.h index 9f1966e..4f5512f 100644 --- a/libs/libtxt/keymap.h +++ b/libs/libtxt/keymap.h @@ -3,6 +3,8 @@ #ifndef KEYMAP_H #define KEYMAP_H +#include <def.h> + #define KEYMAP_LENGTH 90 struct keymap { @@ -11,6 +13,6 @@ struct keymap { char alt_map[KEYMAP_LENGTH]; }; -struct keymap *keymap_parse(const char *path); +struct keymap *keymap_parse(const char *path) NONNULL; #endif diff --git a/libs/libtxt/xml.h b/libs/libtxt/xml.h index 43a8005..3f5c74d 100644 --- a/libs/libtxt/xml.h +++ b/libs/libtxt/xml.h @@ -44,8 +44,8 @@ struct xml { }; enum xml_error xml_parse(struct xml *parser, const char *buffer, u32 buffer_length, - struct xml_token *tokens, u32 num_tokens); + struct xml_token *tokens, u32 num_tokens) NONNULL; -void xml_init(struct xml *parser); +void xml_init(struct xml *parser) NONNULL; #endif |