Author: markj
Date: Fri Jan 27 17:58:41 2017
New Revision: 312893
URL: https://svnweb.freebsd.org/changeset/base/312893
Log:
Fix an off-by-one in an assertion on fasttrap tracepoint sizes.
FASTTRAP_MAX_INSTR_SIZE is the largest valid value of a tracepoint, so
correct the assertion accordingly. This limit was hit with a 15-byte NOP.
Reported by: bdrewery
MFC after: 1 week
Sponsored by: Dell EMC Isilon
Modified:
head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
Modified: head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c Fri Jan
27 17:54:24 2017 (r312892)
+++ head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c Fri Jan
27 17:58:41 2017 (r312893)
@@ -1616,7 +1616,7 @@ fasttrap_pid_probe(struct reg *rp)
* a signal we can reset the value of the scratch register.
*/
- ASSERT(tp->ftt_size < FASTTRAP_MAX_INSTR_SIZE);
+ ASSERT(tp->ftt_size <= FASTTRAP_MAX_INSTR_SIZE);
curthread->t_dtrace_scrpc = addr;
bcopy(tp->ftt_instr, &scratch[i], tp->ftt_size);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
