svn commit: r326785 - vendor-sys/illumos/dist/uts/common/dtrace

[Mark Johnston]

Author: markj
Date: Tue Dec 12 00:51:39 2017
New Revision: 326785
URL: https://svnweb.freebsd.org/changeset/base/326785

Log:
  8880 improve DTrace error checking
  
  illumos/illumos-gate at 2cf374268f3e1c9e9be6367466b183d27632583a
  https://github.com/illumos/illumos-gate/commit/2cf374268f3e1c9e9be6367466b183d27632583a
  
  https://www.illumos.org/issues/8880
  
  Reviewed by: Tim Kordas <tim.kordas at joyent.com>
  Reviewed by: Bryan Cantrill <bryan at joyent.com>
  Reviewed by: Richard Lowe <richlowe at richlowe.net>
  Approved by: Dan McDonald <danmcd at joyent.com>
  Author: Jerry Jelinek <jerry.jelinek at joyent.com>

Modified:
  vendor-sys/illumos/dist/uts/common/dtrace/dtrace.c

Modified: vendor-sys/illumos/dist/uts/common/dtrace/dtrace.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/dtrace/dtrace.c	Mon Dec 11 23:15:43 2017	(r326784)
+++ vendor-sys/illumos/dist/uts/common/dtrace/dtrace.c	Tue Dec 12 00:51:39 2017	(r326785)
@@ -13119,6 +13119,7 @@ static int
 dtrace_dof_relocate(dof_hdr_t *dof, dof_sec_t *sec, uint64_t ubase)
 {
 	uintptr_t daddr = (uintptr_t)dof;
+	uintptr_t ts_end;
 	dof_relohdr_t *dofr =
 	    (dof_relohdr_t *)(uintptr_t)(daddr + sec->dofs_offset);
 	dof_sec_t *ss, *rs, *ts;
@@ -13134,6 +13135,7 @@ dtrace_dof_relocate(dof_hdr_t *dof, dof_sec_t *sec, ui
 	ss = dtrace_dof_sect(dof, DOF_SECT_STRTAB, dofr->dofr_strtab);
 	rs = dtrace_dof_sect(dof, DOF_SECT_RELTAB, dofr->dofr_relsec);
 	ts = dtrace_dof_sect(dof, DOF_SECT_NONE, dofr->dofr_tgtsec);
+	ts_end = (uintptr_t)ts + sizeof (dof_sec_t);
 
 	if (ss == NULL || rs == NULL || ts == NULL)
 		return (-1); /* dtrace_dof_error() has been called already */
@@ -13156,6 +13158,11 @@ dtrace_dof_relocate(dof_hdr_t *dof, dof_sec_t *sec, ui
 		case DOF_RELO_SETX:
 			if (r->dofr_offset >= ts->dofs_size || r->dofr_offset +
 			    sizeof (uint64_t) > ts->dofs_size) {
+				dtrace_dof_error(dof, "bad relocation offset");
+				return (-1);
+			}
+
+			if (taddr >= (uintptr_t)ts && taddr < ts_end) {
 				dtrace_dof_error(dof, "bad relocation offset");
 				return (-1);
 			}