Date: Sat, 28 Jun 2014 19:59:12 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268007 - in head/sys: cddl/contrib/opensolaris/uts/common/dtrace modules/dtrace/fasttrap Message-ID: <201406281959.s5SJxCEn043122@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Sat Jun 28 19:59:12 2014 New Revision: 268007 URL: http://svnweb.freebsd.org/changeset/base/268007 Log: Revert r267869: MFV r260708 4427 pid provider rejects probes with valid UTF-8 names Use of u8_textprep.c broke the build on powerpc. Reported by: bz, rpaulo and tinderbox. Pointyhat: me Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c head/sys/modules/dtrace/fasttrap/Makefile Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Sat Jun 28 18:53:02 2014 (r268006) +++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Sat Jun 28 19:59:12 2014 (r268007) @@ -28,9 +28,9 @@ * Use is subject to license terms. */ -/* - * Copyright (c) 2013, Joyent, Inc. All rights reserved. - */ +#if defined(sun) +#pragma ident "%Z%%M% %I% %E% SMI" +#endif #include <sys/atomic.h> #include <sys/errno.h> @@ -63,7 +63,6 @@ #if !defined(sun) #include <sys/dtrace_bsd.h> #include <sys/eventhandler.h> -#include <sys/u8_textprep.h> #include <sys/user.h> #include <vm/vm.h> #include <vm/pmap.h> @@ -2257,7 +2256,8 @@ fasttrap_ioctl(struct cdev *dev, u_long fasttrap_probe_spec_t *probe; uint64_t noffs; size_t size; - int ret, err; + int ret; + char *c; if (copyin(&uprobe->ftps_noffs, &noffs, sizeof (uprobe->ftps_noffs))) @@ -2286,16 +2286,18 @@ fasttrap_ioctl(struct cdev *dev, u_long * Verify that the function and module strings contain no * funny characters. */ - if (u8_validate(probe->ftps_func, strlen(probe->ftps_func), - NULL, U8_VALIDATE_ENTIRE, &err) < 0) { - ret = EINVAL; - goto err; + for (c = &probe->ftps_func[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; + for (c = &probe->ftps_mod[0]; *c != '\0'; c++) { + if (*c < 0x20 || 0x7f <= *c) { + ret = EINVAL; + goto err; + } } #ifdef notyet Modified: head/sys/modules/dtrace/fasttrap/Makefile ============================================================================== --- head/sys/modules/dtrace/fasttrap/Makefile Sat Jun 28 18:53:02 2014 (r268006) +++ head/sys/modules/dtrace/fasttrap/Makefile Sat Jun 28 19:59:12 2014 (r268007) @@ -8,9 +8,6 @@ KMOD= fasttrap SRCS= fasttrap.c fasttrap_isa.c opt_compat.h SRCS+= vnode_if.h -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/common/unicode -SRCS+= u8_textprep.c - CFLAGS+= -I${SYSDIR}/cddl/compat/opensolaris \ -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ -I${SYSDIR}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406281959.s5SJxCEn043122>