Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F133023287
D29458.id86415.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
3 KB
Referenced Files
None
Subscribers
None
D29458.id86415.diff
View Options
Index: sys/vm/vm_kern.c
===================================================================
--- sys/vm/vm_kern.c
+++ sys/vm/vm_kern.c
@@ -71,12 +71,13 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/kernel.h> /* for ticks and hz */
+#include <sys/asan.h>
#include <sys/domainset.h>
#include <sys/eventhandler.h>
+#include <sys/kernel.h>
#include <sys/lock.h>
-#include <sys/proc.h>
#include <sys/malloc.h>
+#include <sys/proc.h>
#include <sys/rwlock.h>
#include <sys/sysctl.h>
#include <sys/vmem.h>
@@ -220,25 +221,26 @@
vm_object_t object;
vm_offset_t addr, i, offset;
vm_page_t m;
+ vm_size_t asize;
int pflags;
vm_prot_t prot;
object = kernel_object;
- size = round_page(size);
+ asize = round_page(size);
vmem = vm_dom[domain].vmd_kernel_arena;
- if (vmem_alloc(vmem, size, M_BESTFIT | flags, &addr))
+ if (vmem_alloc(vmem, asize, M_BESTFIT | flags, &addr))
return (0);
offset = addr - VM_MIN_KERNEL_ADDRESS;
pflags = malloc2vm_flags(flags) | VM_ALLOC_WIRED;
prot = (flags & M_EXEC) != 0 ? VM_PROT_ALL : VM_PROT_RW;
VM_OBJECT_WLOCK(object);
- for (i = 0; i < size; i += PAGE_SIZE) {
+ for (i = 0; i < asize; i += PAGE_SIZE) {
m = kmem_alloc_contig_pages(object, atop(offset + i),
domain, pflags, 1, low, high, PAGE_SIZE, 0, memattr);
if (m == NULL) {
VM_OBJECT_WUNLOCK(object);
kmem_unback(object, addr, i);
- vmem_free(vmem, addr, size);
+ vmem_free(vmem, addr, asize);
return (0);
}
KASSERT(vm_page_domain(m) == domain,
@@ -251,6 +253,7 @@
prot | PMAP_ENTER_WIRED, 0);
}
VM_OBJECT_WUNLOCK(object);
+ kasan_mark((void *)addr, size, asize, KASAN_KMEM_REDZONE);
return (addr);
}
@@ -299,23 +302,24 @@
vm_object_t object;
vm_offset_t addr, offset, tmp;
vm_page_t end_m, m;
+ vm_size_t asize;
u_long npages;
int pflags;
object = kernel_object;
- size = round_page(size);
+ asize = round_page(size);
vmem = vm_dom[domain].vmd_kernel_arena;
- if (vmem_alloc(vmem, size, flags | M_BESTFIT, &addr))
+ if (vmem_alloc(vmem, asize, flags | M_BESTFIT, &addr))
return (0);
offset = addr - VM_MIN_KERNEL_ADDRESS;
pflags = malloc2vm_flags(flags) | VM_ALLOC_WIRED;
- npages = atop(size);
+ npages = atop(asize);
VM_OBJECT_WLOCK(object);
m = kmem_alloc_contig_pages(object, atop(offset), domain,
pflags, npages, low, high, alignment, boundary, memattr);
if (m == NULL) {
VM_OBJECT_WUNLOCK(object);
- vmem_free(vmem, addr, size);
+ vmem_free(vmem, addr, asize);
return (0);
}
KASSERT(vm_page_domain(m) == domain,
@@ -332,6 +336,7 @@
tmp += PAGE_SIZE;
}
VM_OBJECT_WUNLOCK(object);
+ kasan_mark((void *)addr, size, asize, KASAN_KMEM_REDZONE);
return (addr);
}
@@ -407,21 +412,23 @@
{
vmem_t *arena;
vm_offset_t addr;
+ vm_size_t asize;
int rv;
if (__predict_true((flags & M_EXEC) == 0))
arena = vm_dom[domain].vmd_kernel_arena;
else
arena = vm_dom[domain].vmd_kernel_rwx_arena;
- size = round_page(size);
- if (vmem_alloc(arena, size, flags | M_BESTFIT, &addr))
+ asize = round_page(size);
+ if (vmem_alloc(arena, asize, flags | M_BESTFIT, &addr))
return (0);
- rv = kmem_back_domain(domain, kernel_object, addr, size, flags);
+ rv = kmem_back_domain(domain, kernel_object, addr, asize, flags);
if (rv != KERN_SUCCESS) {
- vmem_free(arena, addr, size);
+ vmem_free(arena, addr, asize);
return (0);
}
+ kasan_mark((void *)addr, size, asize, KASAN_KMEM_REDZONE);
return (addr);
}
@@ -613,6 +620,7 @@
struct vmem *arena;
size = round_page(size);
+ kasan_mark((void *)addr, size, size, 0);
arena = _kmem_unback(kernel_object, addr, size);
if (arena != NULL)
vmem_free(arena, addr, size);
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Oct 23, 4:12 AM (52 m, 18 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24081807
Default Alt Text
D29458.id86415.diff (3 KB)
Attached To
Mode
D29458: kmem: Add KASAN state transitions
Attached
Detach File
Event Timeline
Log In to Comment