diff options
author | Marvin Borner | 2021-04-25 16:31:40 +0200 |
---|---|---|
committer | Marvin Borner | 2021-04-25 16:31:40 +0200 |
commit | 0fe14a1ff936c38ab9aa7f85219d0c155d276823 (patch) | |
tree | b3e4b1f9000819a564656fabf0496f871c1e6eba /kernel/features/mm.c | |
parent | f2b4acb2fe6a366288b19843e0d2678b8590bdf4 (diff) |
Added range-based memory validator
Diffstat (limited to 'kernel/features/mm.c')
-rw-r--r-- | kernel/features/mm.c | 40 |
1 files changed, 30 insertions, 10 deletions
diff --git a/kernel/features/mm.c b/kernel/features/mm.c index 4ed3ab9..a3812bd 100644 --- a/kernel/features/mm.c +++ b/kernel/features/mm.c @@ -608,28 +608,48 @@ u8 memory_is_user(const void *addr) return PDI((u32)addr) >= PAGE_KERNEL_COUNT; } -u8 memory_readable(const void *addr) +u8 memory_readable_range(struct memory_range vrange) { - if (!addr) + if (!vrange.base) return 0; struct proc *proc = proc_current(); - if (proc && !memory_bypass_validity) - return memory_is_user(addr) && virtual_user_readable(proc->page_dir, (u32)addr); - else + if (memory_bypass_validity || !proc) return 1; + + u32 offset = 0; + do { + u8 valid = memory_is_user((void *)(vrange.base + offset)) && + virtual_user_readable(proc->page_dir, vrange.base + offset); + if (!valid) + return 0; + + offset += PAGE_SIZE; + } while (offset < vrange.size); + + return 1; } -u8 memory_writable(const void *addr) +u8 memory_writable_range(struct memory_range vrange) { - if (!addr) + if (!vrange.base) return 0; struct proc *proc = proc_current(); - if (proc && !memory_bypass_validity) - return memory_is_user(addr) && virtual_user_writable(proc->page_dir, (u32)addr); - else + if (memory_bypass_validity || !proc) return 1; + + u32 offset = 0; + do { + u8 valid = memory_is_user((void *)(vrange.base + offset)) && + virtual_user_writable(proc->page_dir, vrange.base + offset); + if (!valid) + return 0; + + offset += PAGE_SIZE; + } while (offset < vrange.size); + + return 1; } struct memory_range memory_range_from(u32 base, u32 size) |