Page MenuHomeFreeBSD

D61859.1795410147.diff
No OneTemporary

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D61859.1795410147.diff

diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -4987,8 +4987,10 @@
{
int error;
- if (efbuf->remainder == 0)
+ if (efbuf->remainder == 0) {
+ vrele(vp);
return (ENOMEM);
+ }
if (efbuf->pdp != NULL)
PWDDESC_XUNLOCK(efbuf->pdp);
export_vnode_to_kinfo(vp, fd, fflags, &efbuf->kif, efbuf->flags);
@@ -5017,20 +5019,8 @@
cap_rights_t rights;
PROC_LOCK_ASSERT(p, MA_OWNED);
+ _PHOLD(p);
- /* ktrace vnode */
- tracevp = ktr_get_tracevp(p, true);
- /* text vnode */
- textvp = p->p_textvp;
- if (textvp != NULL)
- vrefact(textvp);
- /* Controlling tty. */
- cttyvp = NULL;
- if (p->p_pgrp != NULL && p->p_pgrp->pg_session != NULL) {
- cttyvp = p->p_pgrp->pg_session->s_ttyvp;
- if (cttyvp != NULL)
- vrefact(cttyvp);
- }
fdp = fdhold(p);
pdp = pdhold(p);
PROC_UNLOCK(p);
@@ -5043,15 +5033,31 @@
efbuf->flags = flags;
error = 0;
- if (tracevp != NULL)
+ PROC_LOCK(p);
+ tracevp = ktr_get_tracevp(p, true);
+ if (tracevp != NULL) {
+ PROC_UNLOCK(p);
error = export_vnode_to_sb(tracevp, KF_FD_TYPE_TRACE,
FREAD | FWRITE, efbuf);
- if (error == 0 && textvp != NULL)
+ PROC_LOCK(p);
+ }
+ if (error == 0 && (textvp = p->p_textvp) != NULL) {
+ vrefact(textvp);
+ PROC_UNLOCK(p);
error = export_vnode_to_sb(textvp, KF_FD_TYPE_TEXT, FREAD,
efbuf);
- if (error == 0 && cttyvp != NULL)
+ PROC_LOCK(p);
+ }
+ if (error == 0 && p->p_pgrp != NULL && p->p_pgrp->pg_session != NULL &&
+ (cttyvp = p->p_pgrp->pg_session->s_ttyvp) != NULL) {
+ vrefact(cttyvp);
+ PROC_UNLOCK(p);
error = export_vnode_to_sb(cttyvp, KF_FD_TYPE_CTTY,
FREAD | FWRITE, efbuf);
+ PROC_LOCK(p);
+ }
+ _PRELE(p);
+ PROC_UNLOCK(p);
if (error != 0 || pdp == NULL || fdp == NULL)
goto fail;
efbuf->fdp = fdp;
@@ -5086,10 +5092,10 @@
}
}
PWDDESC_XUNLOCK(pdp);
- if (error != 0)
- goto fail;
if (pwd != NULL)
pwd_drop(pwd);
+ if (error != 0)
+ goto fail;
FILEDESC_SLOCK(fdp);
if (refcount_load(&fdp->fd_refcnt) == 0)
goto skip;

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 23, 5:02 AM (11 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41901572
Default Alt Text
D61859.1795410147.diff (2 KB)

Event Timeline