d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFV r260708

Browse Source 
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.

Illumos Revision:	1444d846b126463eb1059a572ff114d51f7562e5

Reference:
https://www.illumos.org/issues/4427

Obtained from:	Illumos
MFC after:	2 weeks
This commit is contained in:
Pedro F. Giffuni 2014-06-25 14:23:30 +00:00
parent 2be4135815
commit af8bd6e468
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
View File

@ -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 cmd, caddr_t arg, int fflag,
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 cmd, caddr_t arg, int fflag,
* 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

3
sys/modules/dtrace/fasttrap/Makefile
View File

@ -8,6 +8,9 @@ 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}