d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Abrogate nchr argument in proc_getargv() and proc_getenvv(): we always want

Browse Source 
to read strings completely to know the actual size.

As a side effect it fixes the issue with kern.proc.args and kern.proc.env
sysctls, which didn't return the size of available data when calling
sysctl(3) with the NULL argument for oldp.

Note, in get_ps_strings(), which does actual work for proc_getargv() and
proc_getenvv(), we still have a safety limit on the size of data read in
case of a corrupted procces stack.

Suggested by:	kib
MFC after:	3 days
This commit is contained in:
Mikolaj Golub 2012-01-15 18:47:24 +00:00
parent f7952747f6
commit fe7f89b71a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=230145
4 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/compat/linprocfs/linprocfs.c
View File

@ -954,7 +954,7 @@ linprocfs_doproccmdline(PFS_FILL_ARGS)
PROC_UNLOCK(p);
ret = proc_getargv(td, p, sb, ARG_MAX);
ret = proc_getargv(td, p, sb);
return (ret);
}
@ -988,7 +988,7 @@ linprocfs_doprocenviron(PFS_FILL_ARGS)
PROC_UNLOCK(p);
ret = proc_getenvv(td, p, sb, ARG_MAX);
ret = proc_getenvv(td, p, sb);
return (ret);
}

2
sys/fs/procfs/procfs_status.c
View File

@ -193,5 +193,5 @@ procfs_doproccmdline(PFS_FILL_ARGS)
PROC_UNLOCK(p);
return (proc_getargv(td, p, sb, ARG_MAX));
return (proc_getargv(td, p, sb));
}

25
sys/kern/kern_proc.c
View File

@ -1631,20 +1631,19 @@ get_proc_vector(struct thread *td, struct proc *p, char ***proc_vectorp,
static int
get_ps_strings(struct thread *td, struct proc *p, struct sbuf *sb,
enum proc_vector_type type, size_t nchr)
enum proc_vector_type type)
{
size_t done, len, vsize;
size_t done, len, nchr, vsize;
int error, i;
char **proc_vector, *sptr;
char pss_string[GET_PS_STRINGS_CHUNK_SZ];
PROC_ASSERT_HELD(p);
/*
* We are not going to read more than 2 * (PATH_MAX + ARG_MAX) bytes.
*/
if (nchr > 2 * (PATH_MAX + ARG_MAX))
nchr = 2 * (PATH_MAX + ARG_MAX);
/*
* We are not going to read more than 2 * (PATH_MAX + ARG_MAX) bytes.
*/
nchr = 2 * (PATH_MAX + ARG_MAX);
error = get_proc_vector(td, p, &proc_vector, &vsize, type);
if (error != 0)
@ -1679,17 +1678,17 @@ get_ps_strings(struct thread *td, struct proc *p, struct sbuf *sb,
}
int
proc_getargv(struct thread *td, struct proc *p, struct sbuf *sb, size_t nchr)
proc_getargv(struct thread *td, struct proc *p, struct sbuf *sb)
{
return (get_ps_strings(curthread, p, sb, PROC_ARG, nchr));
return (get_ps_strings(curthread, p, sb, PROC_ARG));
}
int
proc_getenvv(struct thread *td, struct proc *p, struct sbuf *sb, size_t nchr)
proc_getenvv(struct thread *td, struct proc *p, struct sbuf *sb)
{
return (get_ps_strings(curthread, p, sb, PROC_ENV, nchr));
return (get_ps_strings(curthread, p, sb, PROC_ENV));
}
/*
@ -1728,7 +1727,7 @@ sysctl_kern_proc_args(SYSCTL_HANDLER_ARGS)
_PHOLD(p);
PROC_UNLOCK(p);
sbuf_new_for_sysctl(&sb, NULL, GET_PS_STRINGS_CHUNK_SZ, req);
error = proc_getargv(curthread, p, &sb, req->oldlen);
error = proc_getargv(curthread, p, &sb);
error2 = sbuf_finish(&sb);
PRELE(p);
sbuf_delete(&sb);
@ -1780,7 +1779,7 @@ sysctl_kern_proc_env(SYSCTL_HANDLER_ARGS)
}
sbuf_new_for_sysctl(&sb, NULL, GET_PS_STRINGS_CHUNK_SZ, req);
error = proc_getenvv(curthread, p, &sb, req->oldlen);
error = proc_getenvv(curthread, p, &sb);
error2 = sbuf_finish(&sb);
PRELE(p);
sbuf_delete(&sb);

6
sys/sys/proc.h
View File

@ -859,10 +859,8 @@ int p_canwait(struct thread *td, struct proc *p);
struct pargs *pargs_alloc(int len);
void pargs_drop(struct pargs *pa);
void pargs_hold(struct pargs *pa);
int proc_getargv(struct thread *td, struct proc *p, struct sbuf *sb,
size_t nchr);
int proc_getenvv(struct thread *td, struct proc *p, struct sbuf *sb,
size_t nchr);
int proc_getargv(struct thread *td, struct proc *p, struct sbuf *sb);
int proc_getenvv(struct thread *td, struct proc *p, struct sbuf *sb);
void procinit(void);
void proc_linkup0(struct proc *p, struct thread *td);
void proc_linkup(struct proc *p, struct thread *td);