Date: Sun, 2 Oct 2016 01:18:35 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r306574 - stable/11/sys/cddl/dev/systrace Message-ID: <201610020118.u921IZMl005200@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Sun Oct 2 01:18:34 2016 New Revision: 306574 URL: https://svnweb.freebsd.org/changeset/base/306574 Log: MFC r306220: Re-check the systrace probe ID before calling dtrace_probe(). Modified: stable/11/sys/cddl/dev/systrace/systrace.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cddl/dev/systrace/systrace.c ============================================================================== --- stable/11/sys/cddl/dev/systrace/systrace.c Sun Oct 2 01:16:02 2016 (r306573) +++ stable/11/sys/cddl/dev/systrace/systrace.c Sun Oct 2 01:18:34 2016 (r306574) @@ -193,7 +193,8 @@ systrace_probe(struct syscall_args *sa, memset(uargs, 0, sizeof(uargs)); if (type == SYSTRACE_ENTRY) { - id = sa->callp->sy_entry; + if ((id = sa->callp->sy_entry) == DTRACE_IDNONE) + return; if (sa->callp->sy_systrace_args_func != NULL) /* @@ -215,7 +216,8 @@ systrace_probe(struct syscall_args *sa, */ curthread->t_dtrace_systrace_args = uargs; } else { - id = sa->callp->sy_return; + if ((id = sa->callp->sy_return) == DTRACE_IDNONE) + return; curthread->t_dtrace_systrace_args = NULL; /* Set arg0 and arg1 as the return value of this syscall. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610020118.u921IZMl005200>