summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkj <markj@FreeBSD.org>2016-05-09 17:13:40 +0000
committermarkj <markj@FreeBSD.org>2016-05-09 17:13:40 +0000
commit1708fafa25d9413ab466d3670d803e2ebf885d45 (patch)
tree8ead64b06c03b77a8bdfd090771aa207cf46c3e9
parent2a13823fd61a04edb43e6bd563bd4867606c76c3 (diff)
downloadFreeBSD-src-1708fafa25d9413ab466d3670d803e2ebf885d45.zip
FreeBSD-src-1708fafa25d9413ab466d3670d803e2ebf885d45.tar.gz
MFC r298589:
Allow DOF sections with excessively long probe function components. PR: 207735
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
index 9266ffc..ed99c4b 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
@@ -9295,6 +9295,10 @@ dtrace_helper_provide_one(dof_helper_t *dhp, dof_sec_t *sec, pid_t pid)
probe = (dof_probe_t *)(uintptr_t)(daddr +
prb_sec->dofs_offset + i * prb_sec->dofs_entsize);
+ /* See the check in dtrace_helper_provider_validate(). */
+ if (strlen(strtab + probe->dofpr_func) >= DTRACE_FUNCNAMELEN)
+ continue;
+
dhpb.dthpb_mod = dhp->dofhp_mod;
dhpb.dthpb_func = strtab + probe->dofpr_func;
dhpb.dthpb_name = strtab + probe->dofpr_name;
@@ -15805,7 +15809,13 @@ dtrace_helper_provider_validate(dof_hdr_t *dof, dof_sec_t *sec)
if (strlen(strtab + probe->dofpr_func) >= DTRACE_FUNCNAMELEN) {
dtrace_dof_error(dof, "function name too long");
- return (-1);
+ /*
+ * Keep going if the function name is too long.
+ * Unlike provider and probe names, we cannot reasonably
+ * impose restrictions on function names, since they're
+ * a property of the code being instrumented. We will
+ * skip this probe in dtrace_helper_provide_one().
+ */
}
if (probe->dofpr_name >= str_sec->dofs_size ||
OpenPOWER on IntegriCloud