diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2020-05-21 13:46:30 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2020-05-21 13:46:30 +0000 |
| commit | e165a15b5f1eaa7d2d7edb907e87d04c8e03c060 (patch) | |
| tree | 887f8e19d3732ef689d614c628948263cceae6f6 /lib/libprocstat | |
| parent | 80d7c14c42c684b12f0c8786a05f0eba3d01052f (diff) | |
| download | src-test-e165a15b5f1eaa7d2d7edb907e87d04c8e03c060.tar.gz src-test-e165a15b5f1eaa7d2d7edb907e87d04c8e03c060.zip | |
libprocstat: fix reading of file descriptor table via kvm
This seems to have been broken since r247602 (from year 2013!).
Can be easily tested with
fstat -N /boot/kernel/kernel -M /var/crash/vmcore.last
MFC after: 1 week
Sponsored by: Panzura
Notes
Notes:
svn path=/head/; revision=361330
Diffstat (limited to 'lib/libprocstat')
| -rw-r--r-- | lib/libprocstat/libprocstat.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index cf51270dcedde..6d678c17ff771 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -467,7 +467,7 @@ procstat_getfiles_kvm(struct procstat *procstat, struct kinfo_proc *kp, int mmap vm_map_entry_t entryp; vm_object_t objp; struct vnode *vp; - struct file **ofiles; + struct filedescent *ofiles; struct filestat *entry; struct filestat_list *head; kvm_t *kd; @@ -554,25 +554,25 @@ procstat_getfiles_kvm(struct procstat *procstat, struct kinfo_proc *kp, int mmap } nfiles = filed.fd_lastfile + 1; - ofiles = malloc(nfiles * sizeof(struct file *)); + ofiles = malloc(nfiles * sizeof(struct filedescent)); if (ofiles == NULL) { - warn("malloc(%zu)", nfiles * sizeof(struct file *)); + warn("malloc(%zu)", nfiles * sizeof(struct filedescent)); goto do_mmapped; } if (!kvm_read_all(kd, (unsigned long)filed.fd_ofiles, ofiles, - nfiles * sizeof(struct file *))) { + nfiles * sizeof(struct filedescent))) { warnx("cannot read file structures at %p", (void *)filed.fd_ofiles); free(ofiles); goto do_mmapped; } for (i = 0; i <= filed.fd_lastfile; i++) { - if (ofiles[i] == NULL) + if (ofiles[i].fde_file == NULL) continue; - if (!kvm_read_all(kd, (unsigned long)ofiles[i], &file, + if (!kvm_read_all(kd, (unsigned long)ofiles[i].fde_file, &file, sizeof(struct file))) { warnx("can't read file %d at %p", i, - (void *)ofiles[i]); + (void *)ofiles[i].fde_file); continue; } switch (file.f_type) { |