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

Fix tinderbox build after 1762f674cc ktrace commit.

Browse Source
This commit is contained in:
Mateusz Guzik 2021-05-22 19:37:53 +00:00
parent a0842e69aa
commit 154f0ecc10
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/kern_exec.c
View File

@ -390,7 +390,9 @@ do_execve(struct thread *td, struct image_args *args, struct mac *mac_p,
static const char fexecv_proc_title[] = "(fexecv)";
imgp = &image_params;
#ifdef KTRACE
kiop = NULL;
#endif
/*
* Lock the process and set the P_INEXEC flag to indicate that
@ -780,8 +782,6 @@ do_execve(struct thread *td, struct image_args *args, struct mac *mac_p,
* we do not regain any tracing during a possible block.
*/
setsugid(p);
kiop = NULL;
#ifdef KTRACE
kiop = ktrprocexec(p);
#endif
@ -938,7 +938,9 @@ do_execve(struct thread *td, struct image_args *args, struct mac *mac_p,
*/
if (oldtextvp != NULL)
vrele(oldtextvp);
#ifdef KTRACE
ktr_io_params_free(kiop);
#endif
pargs_drop(oldargs);
pargs_drop(newargs);
if (oldsigacts != NULL)

2
sys/kern/vfs_vnops.c
View File

@ -2371,11 +2371,13 @@ vn_rlimit_fsize(const struct vnode *vp, const struct uio *uio,
if ((uoff_t)uio->uio_offset + uio->uio_resid < lim)
return (0);
#ifdef KTRACE
if (!ktr_write || ktr_filesize_limit_signal) {
PROC_LOCK(td->td_proc);
kern_psignal(td->td_proc, SIGXFSZ);
PROC_UNLOCK(td->td_proc);
}
#endif
return (EFBIG);
}

9
sys/sys/ktrace.h
View File

@ -267,7 +267,16 @@ struct ktr_struct_array {
#ifdef _KERNEL
struct ktr_io_params;
#ifdef KTRACE
struct vnode *ktr_get_tracevp(struct proc *, bool);
#else
static inline struct vnode *
ktr_get_tracevp(struct proc *p, bool ref)
{
return (NULL);
}
#endif
void ktr_io_params_free(struct ktr_io_params *);
void ktrnamei(const char *);
void ktrcsw(int, int, const char *);