summaryrefslogtreecommitdiffstats
path: root/sys/fs/procfs
diff options
context:
space:
mode:
authordyson <dyson@FreeBSD.org>1996-10-30 03:52:57 +0000
committerdyson <dyson@FreeBSD.org>1996-10-30 03:52:57 +0000
commit89da5daba54bd5531e14afb288106143061bc3a9 (patch)
tree29252ce9994c467ca4d69ae1a38deba45aac4229 /sys/fs/procfs
parent0cadb84d6a23fa9bc6b249c3d33338bb2abe4ef8 (diff)
downloadFreeBSD-src-89da5daba54bd5531e14afb288106143061bc3a9.zip
FreeBSD-src-89da5daba54bd5531e14afb288106143061bc3a9.tar.gz
Fix a potential deadlock from the previous commit.
Diffstat (limited to 'sys/fs/procfs')
-rw-r--r--sys/fs/procfs/procfs_map.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
index 889f6b1..b3d6c9b 100644
--- a/sys/fs/procfs/procfs_map.c
+++ b/sys/fs/procfs/procfs_map.c
@@ -103,7 +103,8 @@ procfs_domap(curp, p, pfs, uio)
return (0);
error = 0;
- vm_map_lock(map);
+ if (map != &curproc->p_vmspace->vm_map)
+ vm_map_lock(map);
for (entry = map->header.next;
((uio->uio_resid > 0) && (entry != &map->header));
entry = entry->next) {
@@ -174,7 +175,8 @@ case OBJT_DEVICE:
if (error)
break;
}
- vm_map_unlock(map);
+ if (map != &curproc->p_vmspace->vm_map)
+ vm_map_unlock(map);
return error;
}
OpenPOWER on IntegriCloud