svn commit: r361618 - stable/12/lib/libprocstat

[Andriy Gapon]

Author: avg
Date: Fri May 29 07:37:27 2020
New Revision: 361618
URL: https://svnweb.freebsd.org/changeset/base/361618

Log:
  MFC r361330: 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
  
  Sponsored by:	Panzura

Modified:
  stable/12/lib/libprocstat/libprocstat.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/lib/libprocstat/libprocstat.c
==============================================================================
--- stable/12/lib/libprocstat/libprocstat.c	Fri May 29 05:41:21 2020	(r361617)
+++ stable/12/lib/libprocstat/libprocstat.c	Fri May 29 07:37:27 2020	(r361618)
@@ -457,7 +457,7 @@ procstat_getfiles_kvm(struct procstat *procstat, struc
 	vm_map_t map;
 	vm_object_t objp;
 	struct vnode *vp;
-	struct file **ofiles;
+	struct filedescent *ofiles;
 	struct filestat *entry;
 	struct filestat_list *head;
 	kvm_t *kd;
@@ -532,25 +532,25 @@ procstat_getfiles_kvm(struct procstat *procstat, struc
 	}
 
 	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) {