Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a locking problem by replacing the call to uvm_kernacc() 

with an inlined version that uses kmem_map instead of kernel_map.
This commit is contained in:
chs 1998-02-07 02:40:36 +00:00
parent 17755a8fae
commit 0711fdaf0b
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/kern/kern_malloc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_malloc.c,v 1.28 1998/02/05 07:59:51 mrg Exp $ */
/* $NetBSD: kern_malloc.c,v 1.29 1998/02/07 02:40:36 chs Exp $ */
/*
* Copyright 1996 Christopher G. Demetriou. All rights reserved.
@ -301,10 +301,20 @@ malloc(size, type, flags)
freep = (struct freelist *)va;
savedtype = (unsigned)freep->type < M_LAST ?
memname[freep->type] : "???";
if (kbp->kb_next &&
#if defined(UVM)
!uvm_kernacc(kbp->kb_next, sizeof(struct freelist), 0))
if (kbp->kb_next) {
int rv;
vm_offset_t addr = (vm_offset_t)kbp->kb_next;
vm_map_lock_read(kmem_map);
rv = uvm_map_checkprot(kmem_map, addr,
addr + sizeof(struct freelist),
VM_PROT_WRITE);
vm_map_unlock_read(kmem_map);
if (!rv)
#else
if (kbp->kb_next &&
!kernacc(kbp->kb_next, sizeof(struct freelist), 0))
#endif
{
@ -317,6 +327,9 @@ malloc(size, type, flags)
hitmlog(va);
#endif
kbp->kb_next = NULL;
#if defined(UVM)
}
#endif
}
/* Fill the fields that we've used with WEIRD_ADDR */