diff options
author | Doug Moore <dougm@FreeBSD.org> | 2019-12-08 22:33:51 +0000 |
---|---|---|
committer | Doug Moore <dougm@FreeBSD.org> | 2019-12-08 22:33:51 +0000 |
commit | 8b75b1ad0dfce9d10e04926f796e8a1a9c5a6faf (patch) | |
tree | 3e7877471afa9d859d470cba084f72f399ee006d /lib | |
parent | abd80ddb9474948fb291becc395d72b40927a32b (diff) | |
download | src-8b75b1ad0dfce9d10e04926f796e8a1a9c5a6faf.tar.gz src-8b75b1ad0dfce9d10e04926f796e8a1a9c5a6faf.zip |
Define a vm_map method for user-space for advancing from a map entry
to its successor in cases where examining a map entry requires a
helper like kvm_read_all. Use that method, with kvm_read_all, to fix
procstat_getfiles_kvm, which tries to find the successor now without
using such a helper. This addresses a problem introduced by r355491.
Reviewed by: markj (previous version)
Discussed with: kib
Differential Revision: https://reviews.freebsd.org/D22728
Notes
Notes:
svn path=/head/; revision=355538
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libprocstat/libprocstat.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 239700ed4a2f..2afcfe890125 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -445,6 +445,15 @@ getctty(kvm_t *kd, struct kinfo_proc *kp) return (sess.s_ttyvp); } +static int +procstat_vm_map_reader(void *token, vm_map_entry_t addr, vm_map_entry_t dest) +{ + kvm_t *kd; + + kd = (kvm_t *)token; + return (kvm_read_all(kd, (unsigned long)addr, dest, sizeof(*dest))); +} + static struct filestat_list * procstat_getfiles_kvm(struct procstat *procstat, struct kinfo_proc *kp, int mmapped) { @@ -454,7 +463,6 @@ procstat_getfiles_kvm(struct procstat *procstat, struct kinfo_proc *kp, int mmap struct vm_object object; struct vmspace vmspace; vm_map_entry_t entryp; - vm_map_t map; vm_object_t objp; struct vnode *vp; struct file **ofiles; @@ -615,17 +623,11 @@ do_mmapped: (void *)kp->ki_vmspace); goto exit; } - map = &vmspace.vm_map; - - for (entryp = vm_map_entry_first(map); - entryp != &kp->ki_vmspace->vm_map.header; - entryp = vm_map_entry_succ(&vmentry)) { - if (!kvm_read_all(kd, (unsigned long)entryp, &vmentry, - sizeof(vmentry))) { - warnx("can't read vm_map_entry at %p", - (void *)entryp); - continue; - } + + vmentry = vmspace.vm_map.header; + for (entryp = vm_map_entry_read_succ(kd, &vmentry, procstat_vm_map_reader); + entryp != NULL && entryp != &kp->ki_vmspace->vm_map.header; + entryp = vm_map_entry_read_succ(kd, &vmentry, procstat_vm_map_reader)) { if (vmentry.eflags & MAP_ENTRY_IS_SUB_MAP) continue; if ((objp = vmentry.object.vm_object) == NULL) @@ -660,6 +662,8 @@ do_mmapped: if (entry != NULL) STAILQ_INSERT_TAIL(head, entry, next); } + if (entryp == NULL) + warnx("can't read vm_map_entry"); } exit: return (head); |