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

Rearrange the code so that it checks whether the file is something

Browse Source 
valid to write a core dump to before doing the preparations to actually
write to the file.

Call VOP_GETATTR() before dropping the initial vnode lock.
This commit is contained in:
truckman 2002-07-10 06:31:35 +00:00
parent bc0fd33965
commit 69db9157a1
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/kern/kern_sig.c
View File

@ -1967,8 +1967,6 @@ toolong:
* then it passes on a vnode and a size limit to the process-specific * then it passes on a vnode and a size limit to the process-specific
* coredump routine if there is one; if there _is not_ one, it returns * coredump routine if there is one; if there _is not_ one, it returns
* ENOSYS; otherwise it returns the error from the process-specific routine. * ENOSYS; otherwise it returns the error from the process-specific routine.
*
* XXX: VOP_GETATTR() here requires holding the vnode lock.
*/ */
static int static int
@ -2021,6 +2019,14 @@ restart:
NDFREE(&nd, NDF_ONLY_PNBUF); NDFREE(&nd, NDF_ONLY_PNBUF);
vp = nd.ni_vp; vp = nd.ni_vp;
/* Don't dump to non-regular files or files with links. */
if (vp->v_type != VREG ||
VOP_GETATTR(vp, &vattr, cred, td) || vattr.va_nlink != 1) {
VOP_UNLOCK(vp, 0, td);
error = EFAULT;
goto out2;
}
VOP_UNLOCK(vp, 0, td); VOP_UNLOCK(vp, 0, td);
lf.l_whence = SEEK_SET; lf.l_whence = SEEK_SET;
lf.l_start = 0; lf.l_start = 0;
@ -2040,12 +2046,6 @@ restart:
goto restart; goto restart;
} }
/* Don't dump to non-regular files or files with links. */
if (vp->v_type != VREG ||
VOP_GETATTR(vp, &vattr, cred, td) || vattr.va_nlink != 1) {
error = EFAULT;
goto out1;
}
VATTR_NULL(&vattr); VATTR_NULL(&vattr);
vattr.va_size = 0; vattr.va_size = 0;
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
@ -2060,7 +2060,6 @@ restart:
p->p_sysent->sv_coredump(td, vp, limit) : p->p_sysent->sv_coredump(td, vp, limit) :
ENOSYS; ENOSYS;
out1:
lf.l_type = F_UNLCK; lf.l_type = F_UNLCK;
VOP_ADVLOCK(vp, (caddr_t)p, F_UNLCK, &lf, F_FLOCK); VOP_ADVLOCK(vp, (caddr_t)p, F_UNLCK, &lf, F_FLOCK);
vn_finished_write(mp); vn_finished_write(mp);