svn commit: r358435 - head/cddl/contrib/opensolaris/lib/libdtrace/common

[Mark Johnston]

Author: markj
Date: Fri Feb 28 17:05:27 2020
New Revision: 358435
URL: https://svnweb.freebsd.org/changeset/base/358435

Log:
  Do not load dtraceall.ko if dtrace.ko is already loaded.
  
  This was the intent of the existing code, but instead it would
  unconditionally load dtraceall.ko because of a stale errno value.
  
  Reported by:	pho
  MFC after:	1 week
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Fri Feb 28 17:05:04 2020	(r358434)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Fri Feb 28 17:05:27 2020	(r358435)
@@ -1105,7 +1105,7 @@ dt_vopen(int version, int flags, int *errp,
 	dt_provmod_open(&provmod, &df);
 
 	dtfd = open("/dev/dtrace/dtrace", O_RDWR | O_CLOEXEC);
-	err = errno; /* save errno from opening dtfd */
+	err = dtfd == -1 ? errno : 0; /* save errno from opening dtfd */
 #if defined(__FreeBSD__)
 	/*
 	 * Automatically load the 'dtraceall' module if we couldn't open the