libprocstat: fix kvm filedesc access after introduction of fdescenttbl
This commit is contained in:
parent
a64fab1dd1
commit
f1221c59d7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=363212
@ -459,6 +459,7 @@ procstat_getfiles_kvm(struct procstat *procstat, struct kinfo_proc *kp, int mmap
|
|||||||
{
|
{
|
||||||
struct file file;
|
struct file file;
|
||||||
struct filedesc filed;
|
struct filedesc filed;
|
||||||
|
struct fdescenttbl *fdt;
|
||||||
struct pwd pwd;
|
struct pwd pwd;
|
||||||
unsigned long pwd_addr;
|
unsigned long pwd_addr;
|
||||||
struct vm_map_entry vmentry;
|
struct vm_map_entry vmentry;
|
||||||
@ -467,13 +468,14 @@ procstat_getfiles_kvm(struct procstat *procstat, struct kinfo_proc *kp, int mmap
|
|||||||
vm_map_entry_t entryp;
|
vm_map_entry_t entryp;
|
||||||
vm_object_t objp;
|
vm_object_t objp;
|
||||||
struct vnode *vp;
|
struct vnode *vp;
|
||||||
struct filedescent *ofiles;
|
|
||||||
struct filestat *entry;
|
struct filestat *entry;
|
||||||
struct filestat_list *head;
|
struct filestat_list *head;
|
||||||
kvm_t *kd;
|
kvm_t *kd;
|
||||||
void *data;
|
void *data;
|
||||||
int i, fflags;
|
int fflags;
|
||||||
|
unsigned int i;
|
||||||
int prot, type;
|
int prot, type;
|
||||||
|
size_t fdt_size;
|
||||||
unsigned int nfiles;
|
unsigned int nfiles;
|
||||||
bool haspwd;
|
bool haspwd;
|
||||||
|
|
||||||
@ -553,26 +555,31 @@ procstat_getfiles_kvm(struct procstat *procstat, struct kinfo_proc *kp, int mmap
|
|||||||
STAILQ_INSERT_TAIL(head, entry, next);
|
STAILQ_INSERT_TAIL(head, entry, next);
|
||||||
}
|
}
|
||||||
|
|
||||||
nfiles = filed.fd_lastfile + 1;
|
if (!kvm_read_all(kd, (unsigned long)filed.fd_files, &nfiles,
|
||||||
ofiles = malloc(nfiles * sizeof(struct filedescent));
|
sizeof(nfiles))) {
|
||||||
if (ofiles == NULL) {
|
warnx("can't read fd_files at %p", (void *)filed.fd_files);
|
||||||
warn("malloc(%zu)", nfiles * sizeof(struct filedescent));
|
return (NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
fdt_size = sizeof(*fdt) + nfiles * sizeof(struct filedescent);
|
||||||
|
fdt = malloc(fdt_size);
|
||||||
|
if (fdt == NULL) {
|
||||||
|
warn("malloc(%zu)", fdt_size);
|
||||||
goto do_mmapped;
|
goto do_mmapped;
|
||||||
}
|
}
|
||||||
if (!kvm_read_all(kd, (unsigned long)filed.fd_ofiles, ofiles,
|
if (!kvm_read_all(kd, (unsigned long)filed.fd_files, fdt, fdt_size)) {
|
||||||
nfiles * sizeof(struct filedescent))) {
|
warnx("cannot read file structures at %p", (void *)filed.fd_files);
|
||||||
warnx("cannot read file structures at %p",
|
free(fdt);
|
||||||
(void *)filed.fd_ofiles);
|
|
||||||
free(ofiles);
|
|
||||||
goto do_mmapped;
|
goto do_mmapped;
|
||||||
}
|
}
|
||||||
for (i = 0; i <= filed.fd_lastfile; i++) {
|
for (i = 0; i < nfiles; i++) {
|
||||||
if (ofiles[i].fde_file == NULL)
|
if (fdt->fdt_ofiles[i].fde_file == NULL) {
|
||||||
continue;
|
continue;
|
||||||
if (!kvm_read_all(kd, (unsigned long)ofiles[i].fde_file, &file,
|
}
|
||||||
|
if (!kvm_read_all(kd, (unsigned long)fdt->fdt_ofiles[i].fde_file, &file,
|
||||||
sizeof(struct file))) {
|
sizeof(struct file))) {
|
||||||
warnx("can't read file %d at %p", i,
|
warnx("can't read file %d at %p", i,
|
||||||
(void *)ofiles[i].fde_file);
|
(void *)fdt->fdt_ofiles[i].fde_file);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
switch (file.f_type) {
|
switch (file.f_type) {
|
||||||
@ -623,7 +630,7 @@ procstat_getfiles_kvm(struct procstat *procstat, struct kinfo_proc *kp, int mmap
|
|||||||
if (entry != NULL)
|
if (entry != NULL)
|
||||||
STAILQ_INSERT_TAIL(head, entry, next);
|
STAILQ_INSERT_TAIL(head, entry, next);
|
||||||
}
|
}
|
||||||
free(ofiles);
|
free(fdt);
|
||||||
|
|
||||||
do_mmapped:
|
do_mmapped:
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user