From d43a3388a976a74ae109c5b8b5a31f82a16b45db Mon Sep 17 00:00:00 2001 From: Aleksa Vuckovic Date: Sat, 26 Nov 2022 00:22:10 +0100 Subject: fixing issues 1) main.c: order of init (multiboot.c must be after heap & paging because it uses heap to allocate pages for framebuffer) 2) paging.c: zeroing new pages allocated via heap 3) multiboot2.c: invalid pointer arithmetic 4) libk/string.c: check for null pointers in memcpy 5) paging: only page_lvl2 should have FLAG_HUGE 6) keyboard.c: kfree(print_buff) --- kernel/src/boot/multiboot2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel/src/boot/multiboot2.c') diff --git a/kernel/src/boot/multiboot2.c b/kernel/src/boot/multiboot2.c index 9410273..b111649 100644 --- a/kernel/src/boot/multiboot2.c +++ b/kernel/src/boot/multiboot2.c @@ -23,8 +23,8 @@ void init_fb(mb2_tag_fb* tag_fb) main_fb.bpp = tag_fb->framebuffer_bpp; // identity map framebuffer address - map_addr(main_fb.addr, main_fb.addr, FLAG_PRESENT + FLAG_WRITABLE); - map_addr(main_fb.addr + PAGE_SIZE, main_fb.addr + PAGE_SIZE, FLAG_PRESENT + FLAG_WRITABLE); + map_addr(main_fb.addr, main_fb.addr, FLAG_PRESENT | FLAG_WRITABLE | FLAG_USER); + map_addr(main_fb.addr + PAGE_SIZE, main_fb.addr + PAGE_SIZE, FLAG_PRESENT | FLAG_WRITABLE | FLAG_USER); } void init_mmap(mb2_tag_mmap* tag_mmap) -- cgit v1.2.3