svn commit: r228029 - head/sys/kern
Mikolaj Golub
trociny at FreeBSD.org
Sun Nov 27 16:56:02 UTC 2011
Author: trociny
Date: Sun Nov 27 16:56:01 2011
New Revision: 228029
URL: http://svn.freebsd.org/changeset/base/228029
Log:
In sysctl_kern_proc_auxv the process was released too early: we still
need to hold it when checking process sv_flags.
MFC after: 2 weeks
Modified:
head/sys/kern/kern_proc.c
Modified: head/sys/kern/kern_proc.c
==============================================================================
--- head/sys/kern/kern_proc.c Sun Nov 27 16:50:13 2011 (r228028)
+++ head/sys/kern/kern_proc.c Sun Nov 27 16:56:01 2011 (r228029)
@@ -1768,7 +1768,7 @@ sysctl_kern_proc_auxv(SYSCTL_HANDLER_ARG
int *name = (int*) arg1;
u_int namelen = arg2;
struct proc *p;
- size_t vsize;
+ size_t vsize, size;
char **auxv;
int error;
@@ -1793,16 +1793,18 @@ sysctl_kern_proc_auxv(SYSCTL_HANDLER_ARG
_PHOLD(p);
PROC_UNLOCK(p);
error = get_proc_vector(curthread, p, &auxv, &vsize, PROC_AUX);
- PRELE(p);
if (error == 0) {
#ifdef COMPAT_FREEBSD32
if (SV_PROC_FLAG(p, SV_ILP32) != 0)
- error = SYSCTL_OUT(req, auxv, vsize *
- sizeof(Elf32_Auxinfo));
+ size = vsize * sizeof(Elf32_Auxinfo);
else
#endif
- error = SYSCTL_OUT(req, auxv, vsize * sizeof(Elf_Auxinfo));
+ size = vsize * sizeof(Elf_Auxinfo);
+ PRELE(p);
+ error = SYSCTL_OUT(req, auxv, size);
free(auxv, M_TEMP);
+ } else {
+ PRELE(p);
}
return (error);
}
More information about the svn-src-all
mailing list