- Update kvm_deadfiles to be compatible with the new system which has no
global list of all files. - Mark kvm_getfiles() as broken since the live version exports struct xfile with no filelist at the head and does so incorrectly and the deadfiles version exports struct file with a filelist at the head. It is not known if either version works or complies to the manpage.
This commit is contained in:
parent
397c19d175
commit
5c556b8aee
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=174989
@ -68,40 +68,78 @@ static char sccsid[] = "@(#)kvm_file.c 8.1 (Berkeley) 6/4/93";
|
|||||||
#define KREAD(kd, addr, obj) \
|
#define KREAD(kd, addr, obj) \
|
||||||
(kvm_read(kd, addr, obj, sizeof(*obj)) != sizeof(*obj))
|
(kvm_read(kd, addr, obj, sizeof(*obj)) != sizeof(*obj))
|
||||||
|
|
||||||
|
#define KREADN(kd, addr, obj, cnt) \
|
||||||
|
(kvm_read(kd, addr, obj, (cnt)) != (cnt))
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Get file structures.
|
* Get file structures.
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
kvm_deadfiles(kd, op, arg, filehead_o, nfiles)
|
kvm_deadfiles(kd, op, arg, allproc_o, nprocs)
|
||||||
kvm_t *kd;
|
kvm_t *kd;
|
||||||
int op, arg, nfiles;
|
int op, arg, nprocs;
|
||||||
long filehead_o;
|
long allproc_o;
|
||||||
{
|
{
|
||||||
int buflen = kd->arglen, n = 0;
|
struct proc proc;
|
||||||
|
struct filedesc filed;
|
||||||
|
int buflen = kd->arglen, ocnt = 0, n = 0, once = 0, i;
|
||||||
|
struct file **ofiles;
|
||||||
struct file *fp;
|
struct file *fp;
|
||||||
|
struct proc *p;
|
||||||
char *where = kd->argspc;
|
char *where = kd->argspc;
|
||||||
struct filelist filehead;
|
|
||||||
|
|
||||||
/*
|
if (buflen < sizeof (struct file *) + sizeof (struct file))
|
||||||
* first copyout filehead
|
return (0);
|
||||||
*/
|
if (KREAD(kd, allproc_o, &p)) {
|
||||||
if (buflen > sizeof (filehead)) {
|
_kvm_err(kd, kd->program, "cannot read allproc");
|
||||||
if (KREAD(kd, filehead_o, &filehead)) {
|
return (0);
|
||||||
_kvm_err(kd, kd->program, "can't read filehead");
|
}
|
||||||
|
for (; p != NULL; p = LIST_NEXT(&proc, p_list)) {
|
||||||
|
if (KREAD(kd, (u_long)p, &proc)) {
|
||||||
|
_kvm_err(kd, kd->program, "can't read proc at %x", p);
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
if (proc.p_state == PRS_NEW)
|
||||||
|
continue;
|
||||||
|
if (proc.p_fd == NULL)
|
||||||
|
continue;
|
||||||
|
if (KREAD(kd, (u_long)p->p_fd, &filed)) {
|
||||||
|
_kvm_err(kd, kd->program, "can't read filedesc at %x",
|
||||||
|
p->p_fd);
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
if (filed.fd_lastfile + 1 > ocnt) {
|
||||||
|
ocnt = filed.fd_lastfile + 1;
|
||||||
|
free(ofiles);
|
||||||
|
ofiles = (struct file **)_kvm_malloc(kd,
|
||||||
|
ocnt * sizeof(struct file *));
|
||||||
|
if (ofiles == 0)
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
if (KREADN(kd, (u_long)filed.fd_ofiles, ofiles,
|
||||||
|
ocnt * sizeof(struct file *))) {
|
||||||
|
_kvm_err(kd, kd->program, "can't read ofiles at %x",
|
||||||
|
filed.fd_ofiles);
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
buflen -= sizeof (filehead);
|
for (i = 0; i <= filed.fd_lastfile; i++) {
|
||||||
where += sizeof (filehead);
|
if ((fp = ofiles[i]) == NULL)
|
||||||
*(struct filelist *)kd->argspc = filehead;
|
continue;
|
||||||
}
|
/*
|
||||||
/*
|
* copyout filehead (legacy)
|
||||||
* followed by an array of file structures
|
*/
|
||||||
*/
|
if (!once) {
|
||||||
LIST_FOREACH(fp, &filehead, f_list) {
|
*(struct file **)kd->argspc = fp;
|
||||||
if (buflen > sizeof (struct file)) {
|
*(struct file **)where = fp;
|
||||||
|
buflen -= sizeof (fp);
|
||||||
|
where += sizeof (fp);
|
||||||
|
once = 1;
|
||||||
|
}
|
||||||
|
if (buflen < sizeof (struct file))
|
||||||
|
goto fail;
|
||||||
if (KREAD(kd, (long)fp, ((struct file *)where))) {
|
if (KREAD(kd, (long)fp, ((struct file *)where))) {
|
||||||
_kvm_err(kd, kd->program, "can't read kfp");
|
_kvm_err(kd, kd->program, "can't read kfp");
|
||||||
return (0);
|
goto fail;
|
||||||
}
|
}
|
||||||
buflen -= sizeof (struct file);
|
buflen -= sizeof (struct file);
|
||||||
fp = (struct file *)where;
|
fp = (struct file *)where;
|
||||||
@ -109,11 +147,12 @@ kvm_deadfiles(kd, op, arg, filehead_o, nfiles)
|
|||||||
n++;
|
n++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (n != nfiles) {
|
free(ofiles);
|
||||||
_kvm_err(kd, kd->program, "inconsistant nfiles");
|
return (n);
|
||||||
return (0);
|
fail:
|
||||||
}
|
free(ofiles);
|
||||||
return (nfiles);
|
return (0);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
char *
|
char *
|
||||||
@ -122,11 +161,11 @@ kvm_getfiles(kd, op, arg, cnt)
|
|||||||
int op, arg;
|
int op, arg;
|
||||||
int *cnt;
|
int *cnt;
|
||||||
{
|
{
|
||||||
int mib[2], st, nfiles;
|
int mib[2], st, n, nfiles, nprocs;
|
||||||
size_t size;
|
size_t size;
|
||||||
struct file *fp, *fplim;
|
|
||||||
struct filelist filehead;
|
|
||||||
|
|
||||||
|
_kvm_syserr(kd, kd->program, "kvm_getfiles has been broken for years");
|
||||||
|
return (0);
|
||||||
if (ISALIVE(kd)) {
|
if (ISALIVE(kd)) {
|
||||||
size = 0;
|
size = 0;
|
||||||
mib[0] = CTL_KERN;
|
mib[0] = CTL_KERN;
|
||||||
@ -144,21 +183,18 @@ kvm_getfiles(kd, op, arg, cnt)
|
|||||||
return (0);
|
return (0);
|
||||||
kd->arglen = size;
|
kd->arglen = size;
|
||||||
st = sysctl(mib, 2, kd->argspc, &size, NULL, 0);
|
st = sysctl(mib, 2, kd->argspc, &size, NULL, 0);
|
||||||
if (st == -1 || size < sizeof(filehead)) {
|
if (st != 0) {
|
||||||
_kvm_syserr(kd, kd->program, "kvm_getfiles");
|
_kvm_syserr(kd, kd->program, "kvm_getfiles");
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
filehead = *(struct filelist *)kd->argspc;
|
nfiles = size / sizeof(struct xfile);
|
||||||
fp = (struct file *)(kd->argspc + sizeof (filehead));
|
|
||||||
fplim = (struct file *)(kd->argspc + size);
|
|
||||||
for (nfiles = 0; LIST_FIRST(&filehead) && (fp < fplim); nfiles++, fp++)
|
|
||||||
LIST_FIRST(&filehead) = LIST_NEXT(fp, f_list);
|
|
||||||
} else {
|
} else {
|
||||||
struct nlist nl[3], *p;
|
struct nlist nl[4], *p;
|
||||||
|
|
||||||
nl[0].n_name = "_filehead";
|
nl[0].n_name = "_allproc";
|
||||||
nl[1].n_name = "_nfiles";
|
nl[1].n_name = "_nprocs";
|
||||||
nl[2].n_name = 0;
|
nl[2].n_name = "_nfiles";
|
||||||
|
nl[3].n_name = 0;
|
||||||
|
|
||||||
if (kvm_nlist(kd, nl) != 0) {
|
if (kvm_nlist(kd, nl) != 0) {
|
||||||
for (p = nl; p->n_type != 0; ++p)
|
for (p = nl; p->n_type != 0; ++p)
|
||||||
@ -167,11 +203,15 @@ kvm_getfiles(kd, op, arg, cnt)
|
|||||||
"%s: no such symbol", p->n_name);
|
"%s: no such symbol", p->n_name);
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
if (KREAD(kd, nl[0].n_value, &nfiles)) {
|
if (KREAD(kd, nl[1].n_value, &nprocs)) {
|
||||||
|
_kvm_err(kd, kd->program, "can't read nprocs");
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
if (KREAD(kd, nl[2].n_value, &nfiles)) {
|
||||||
_kvm_err(kd, kd->program, "can't read nfiles");
|
_kvm_err(kd, kd->program, "can't read nfiles");
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
size = sizeof(filehead) + (nfiles + 10) * sizeof(struct file);
|
size = sizeof(void *) + (nfiles + 10) * sizeof(struct file);
|
||||||
if (kd->argspc == 0)
|
if (kd->argspc == 0)
|
||||||
kd->argspc = (char *)_kvm_malloc(kd, size);
|
kd->argspc = (char *)_kvm_malloc(kd, size);
|
||||||
else if (kd->arglen < size)
|
else if (kd->arglen < size)
|
||||||
@ -179,9 +219,12 @@ kvm_getfiles(kd, op, arg, cnt)
|
|||||||
if (kd->argspc == 0)
|
if (kd->argspc == 0)
|
||||||
return (0);
|
return (0);
|
||||||
kd->arglen = size;
|
kd->arglen = size;
|
||||||
nfiles = kvm_deadfiles(kd, op, arg, nl[1].n_value, nfiles);
|
n = kvm_deadfiles(kd, op, arg, nl[0].n_value, nprocs);
|
||||||
if (nfiles == 0)
|
if (n != nfiles) {
|
||||||
|
_kvm_err(kd, kd->program, "inconsistant nfiles");
|
||||||
return (0);
|
return (0);
|
||||||
|
}
|
||||||
|
nfiles = n;
|
||||||
}
|
}
|
||||||
*cnt = nfiles;
|
*cnt = nfiles;
|
||||||
return (kd->argspc);
|
return (kd->argspc);
|
||||||
|
Loading…
Reference in New Issue
Block a user