Author: kib
Date: Sat Mar 12 17:25:33 2016
New Revision: 296730
URL: https://svnweb.freebsd.org/changeset/base/296730
Log:
MFC r295352:
Do not call vn_fullpath(9) (through the pmc_getfilename() wrapper)
when its result is immediately ignored, i.e. for kernel processes
forked from the user process. Do not test for non-null before freeing
string.
Modified:
stable/10/sys/dev/hwpmc/hwpmc_mod.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/hwpmc/hwpmc_mod.c
==============================================================================
--- stable/10/sys/dev/hwpmc/hwpmc_mod.c Sat Mar 12 17:23:15 2016
(r296729)
+++ stable/10/sys/dev/hwpmc/hwpmc_mod.c Sat Mar 12 17:25:33 2016
(r296730)
@@ -1014,14 +1014,14 @@ pmc_attach_one_process(struct proc *p, s
/* issue an attach event to a configured log file */
if (pm->pm_owner->po_flags & PMC_PO_OWNS_LOGFILE) {
- pmc_getfilename(p->p_textvp, &fullpath, &freepath);
if (p->p_flag & P_KTHREAD) {
fullpath = kernelname;
freepath = NULL;
- } else
+ } else {
+ pmc_getfilename(p->p_textvp, &fullpath, &freepath);
pmclog_process_pmcattach(pm, p->p_pid, fullpath);
- if (freepath)
- free(freepath, M_TEMP);
+ }
+ free(freepath, M_TEMP);
if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm)))
pmc_log_process_mappings(pm->pm_owner, p);
}
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
