From owner-p4-projects@FreeBSD.ORG  Wed Aug  4 16:14:43 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0A8F2106567F; Wed,  4 Aug 2010 16:14:43 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AA55D106566C
	for <perforce@FreeBSD.org>; Wed,  4 Aug 2010 16:14:42 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 971D58FC1D
	for <perforce@FreeBSD.org>; Wed,  4 Aug 2010 16:14:42 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o74GEgJZ011064
	for <perforce@FreeBSD.org>; Wed, 4 Aug 2010 16:14:42 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o74GEgWf011062
	for perforce@freebsd.org; Wed, 4 Aug 2010 16:14:42 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 4 Aug 2010 16:14:42 GMT
Message-Id: <201008041614.o74GEgWf011062@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 181839 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Aug 2010 16:14:43 -0000

http://p4web.freebsd.org/@@181839?ac=10

Change 181839 by hselasky@hselasky_laptop001 on 2010/08/04 16:14:14

	USB core:
		- be more strict filtering strings.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_request.c#39 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_request.c#39 (text+ko) ====

@@ -1029,14 +1029,22 @@
 		}
 
 		/*
-		 * Filter by default - we don't allow greater and less than
-		 * signs because they might confuse the dmesg printouts!
+		 * Filter by default - We only allow alphanumerical
+		 * and a few more to avoid any problems with scripts
+		 * and daemons.
 		 */
-		if ((*s == '<') || (*s == '>') || (!isprint(*s))) {
-			/* silently skip bad character */
-			continue;
+		if (((*s >= 'a') && (*s <= 'z')) ||
+		    ((*s >= 'A') && (*s <= 'Z')) ||
+		    ((*s >= '0') && (*s <= '9')) ||
+		    (*s == '-') ||
+		    (*s == '+') ||
+		    (*s == ' ') ||
+		    (*s == '.') ||
+		    (*s == ',')) {
+			/* allowed */
+			s++;
 		}
-		s++;
+		/* silently skip bad character */
 	}
 	*s = 0;				/* zero terminate resulting string */
 	return (USB_ERR_NORMAL_COMPLETION);