svn commit: r268734 - in stable/10/sys: cddl/contrib/opensolaris/uts/common/dtrace modules/dtrace/fasttrap

[Pedro F. Giffuni]

Author: pfg
Date: Wed Jul 16 02:02:46 2014
New Revision: 268734
URL: http://svnweb.freebsd.org/changeset/base/268734

Log:
  MFC	r268097:
  
  MFV	r260708
  4427 pid provider rejects probes with valid UTF-8 names
  
  This make use of Solaris' u8_validate() which we happen to
  use since r185029 for ZFS.
  Use of u8_textprep.c required -Wno-cast-qual for powerpc.
  
  Illumos Revision:	1444d846b126463eb1059a572ff114d51f7562e5
  
  Reference:
  https://www.illumos.org/issues/4427
  
  Obtained from:	Illumos

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
  stable/10/sys/modules/dtrace/fasttrap/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c	Wed Jul 16 00:43:53 2014	(r268733)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c	Wed Jul 16 02:02:46 2014	(r268734)
@@ -28,9 +28,9 @@
  * Use is subject to license terms.
  */
 
-#if defined(sun)
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#endif
+/*
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ */
 
 #include <sys/atomic.h>
 #include <sys/errno.h>
@@ -63,6 +63,7 @@
 #if !defined(sun)
 #include <sys/user.h>
 #include <sys/dtrace_bsd.h>
+#include <sys/u8_textprep.h>
 #include <cddl/dev/dtrace/dtrace_cddl.h>
 #endif
 
@@ -2068,8 +2069,7 @@ fasttrap_ioctl(struct cdev *dev, u_long 
 		fasttrap_probe_spec_t *probe;
 		uint64_t noffs;
 		size_t size;
-		int ret;
-		char *c;
+		int ret, err;
 
 		if (copyin(&uprobe->ftps_noffs, &noffs,
 		    sizeof (uprobe->ftps_noffs)))
@@ -2099,18 +2099,16 @@ fasttrap_ioctl(struct cdev *dev, u_long 
 		 * Verify that the function and module strings contain no
 		 * funny characters.
 		 */
-		for (c = &probe->ftps_func[0]; *c != '\0'; c++) {
-			if (*c < 0x20 || 0x7f <= *c) {
-				ret = EINVAL;
-				goto err;
-			}
+		if (u8_validate(probe->ftps_func, strlen(probe->ftps_func),
+		    NULL, U8_VALIDATE_ENTIRE, &err) < 0) {
+			ret = EINVAL;
+			goto err;
 		}
 
-		for (c = &probe->ftps_mod[0]; *c != '\0'; c++) {
-			if (*c < 0x20 || 0x7f <= *c) {
-				ret = EINVAL;
-				goto err;
-			}
+		if (u8_validate(probe->ftps_mod, strlen(probe->ftps_mod),
+		    NULL, U8_VALIDATE_ENTIRE, &err) < 0) {
+			ret = EINVAL;
+			goto err;
 		}
 
 #ifdef notyet

Modified: stable/10/sys/modules/dtrace/fasttrap/Makefile
==============================================================================
--- stable/10/sys/modules/dtrace/fasttrap/Makefile	Wed Jul 16 00:43:53 2014	(r268733)
+++ stable/10/sys/modules/dtrace/fasttrap/Makefile	Wed Jul 16 02:02:46 2014	(r268734)
@@ -18,9 +18,13 @@ CFLAGS+=	-I${.CURDIR}/../../../cddl/cont
 .PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/uts/powerpc/dtrace
 .endif
 
+.PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/common/unicode
+SRCS+=		u8_textprep.c
+
 CFLAGS+=	-DSMP
 
 .include <bsd.kmod.mk>
 
 CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h
+CWARNFLAGS+=	-Wno-cast-qual
 CWARNFLAGS+=	-Wno-unused