Author: markj
Date: Wed Jul 17 16:38:29 2019
New Revision: 350084
URL: https://svnweb.freebsd.org/changeset/base/350084

Log:
  Fix FASTTRAPIOC_GETINSTR.
  
  This ioctl is used when a breakpoint is encountered while disassembling
  a symbol in the target process.  Since only one DTrace consumer can
  toggle or enumerate fasttrap probes from a given process at time, this
  ioctl does not appear to be used in practice.

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
  head/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h

Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c      Wed Jul 
17 16:34:32 2019        (r350083)
+++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c      Wed Jul 
17 16:38:29 2019        (r350084)
@@ -2326,10 +2326,8 @@ err:
                int ret;
 #endif
 
-#ifdef illumos
                if (copyin((void *)arg, &instr, sizeof (instr)) != 0)
                        return (EFAULT);
-#endif
 
 #ifdef notyet
                if (!PRIV_POLICY_CHOICE(cr, PRIV_ALL, B_FALSE)) {

Modified: head/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h Wed Jul 17 
16:34:32 2019        (r350083)
+++ head/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h Wed Jul 17 
16:38:29 2019        (r350084)
@@ -42,7 +42,7 @@ extern "C" {
 #define        FASTTRAPIOC_MAKEPROBE   (FASTTRAPIOC | 1)
 #define        FASTTRAPIOC_GETINSTR    (FASTTRAPIOC | 2)
 #else
-#define        FASTTRAPIOC_GETINSTR    _IOWR('f', 2, uint8_t)
+#define        FASTTRAPIOC_GETINSTR    _IO('f', 2)
 #define        FASTTRAPIOC_MAKEPROBE   _IO('f', 3)
 #endif
 
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to