Page MenuHomeFreeBSD
Files F148061459

D30400.id89660.diff
No OneTemporary
Actions

D30400.id89660.diff
View Options

diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -1260,7 +1260,7 @@
static void
ktr_writerequest(struct thread *td, struct ktr_request *req)
{
- struct ktr_io_params *kiop;
+ struct ktr_io_params *kiop, *kiop1;
struct ktr_header *kth;
struct vnode *vp;
struct proc *p;
@@ -1275,14 +1275,10 @@
p = td->td_proc;
/*
- * We hold the vnode and credential for use in I/O in case ktrace is
+ * We reference the kiop for use in I/O in case ktrace is
* disabled on the process as we write out the request.
- *
- * XXXRW: This is not ideal: we could end up performing a write after
- * the vnode has been closed.
*/
mtx_lock(&ktrace_mtx);
-
kiop = p->p_ktrioparms;
/*
@@ -1294,13 +1290,12 @@
return;
}
+ ktr_io_params_ref(kiop);
vp = kiop->vp;
cred = kiop->cr;
lim = kiop->lim;
- vrefact(vp);
KASSERT(cred != NULL, ("ktr_writerequest: cred == NULL"));
- crhold(cred);
mtx_unlock(&ktrace_mtx);
kth = &req->ktr_header;
@@ -1342,9 +1337,11 @@
error = VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, cred);
VOP_UNLOCK(vp);
vn_finished_write(mp);
- crfree(cred);
if (error == 0) {
- vrele(vp);
+ mtx_lock(&ktrace_mtx);
+ kiop = ktr_io_params_rele(kiop);
+ mtx_unlock(&ktrace_mtx);
+ ktr_io_params_free(kiop);
return;
}
@@ -1357,12 +1354,15 @@
"ktrace write failed, errno %d, tracing stopped for pid %d\n",
error, p->p_pid);
+ kiop1 = NULL;
PROC_LOCK(p);
mtx_lock(&ktrace_mtx);
if (p->p_ktrioparms != NULL && p->p_ktrioparms->vp == vp)
- kiop = ktr_freeproc(p);
+ kiop1 = ktr_freeproc(p);
+ kiop = ktr_io_params_rele(kiop);
mtx_unlock(&ktrace_mtx);
PROC_UNLOCK(p);
+ ktr_io_params_free(kiop1);
ktr_io_params_free(kiop);
vrele(vp);
}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 16, 12:16 PM (9 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29770046
Default Alt Text
D30400.id89660.diff (1 KB)

Event Timeline