Date: Tue, 1 Jul 2014 15:36:05 +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: r268097 - in head/sys: cddl/contrib/opensolaris/uts/common/dtrace modules/dtrace/fasttrap Message-ID: <201407011536.s61Fa5pe040386@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Tue Jul 1 15:36:05 2014 New Revision: 268097 URL: http://svnweb.freebsd.org/changeset/base/268097 Log: Revert r268007, and re-adapt MFV r260708: 4427 pid provider rejects probes with valid UTF-8 names Use of u8_textprep.c required -Wno-cast-qual for powerpc. MFC after: 2 weeks 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 Tue Jul 1 15:05:23 2014 (r268096) +++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Tue Jul 1 15:36:05 2014 (r268097) @@ -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/dtrace_bsd.h> #include <sys/eventhandler.h> +#include <sys/u8_textprep.h> #include <sys/user.h> #include <vm/vm.h> #include <vm/pmap.h> @@ -2256,8 +2257,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))) @@ -2286,18 +2286,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: head/sys/modules/dtrace/fasttrap/Makefile ============================================================================== --- head/sys/modules/dtrace/fasttrap/Makefile Tue Jul 1 15:05:23 2014 (r268096) +++ head/sys/modules/dtrace/fasttrap/Makefile Tue Jul 1 15:36:05 2014 (r268097) @@ -20,9 +20,13 @@ CFLAGS+= -I${SYSDIR}/cddl/contrib/openso .PATH: ${SYSDIR}/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 ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h +CWARNFLAGS+= -Wno-cast-qual CWARNFLAGS+= -Wno-unused
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407011536.s61Fa5pe040386>