From owner-svn-src-all@freebsd.org  Fri Oct 20 10:01:22 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AEF25E2CCB5;
 Fri, 20 Oct 2017 10:01:22 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7BC8E702B2;
 Fri, 20 Oct 2017 10:01:22 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9KA1LxY077128;
 Fri, 20 Oct 2017 10:01:21 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9KA1Lc7077127;
 Fri, 20 Oct 2017 10:01:21 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201710201001.v9KA1Lc7077127@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Fri, 20 Oct 2017 10:01:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r324798 - stable/10/sys/dev/usb
X-SVN-Group: stable-10
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: stable/10/sys/dev/usb
X-SVN-Commit-Revision: 324798
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Oct 2017 10:01:22 -0000

Author: hselasky
Date: Fri Oct 20 10:01:21 2017
New Revision: 324798
URL: https://svnweb.freebsd.org/changeset/base/324798

Log:
  MFC r323916:
  Extend sysctl description for hw.usb.disable_enumeration .
  
  PR:		222505
  Submitted by:	Julian H. Stacey <jhs@berklix.com>
  Sponsored by:	Mellanox Technologies

Modified:
  stable/10/sys/dev/usb/usb_hub.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/usb/usb_hub.c
==============================================================================
--- stable/10/sys/dev/usb/usb_hub.c	Fri Oct 20 09:59:39 2017	(r324797)
+++ stable/10/sys/dev/usb/usb_hub.c	Fri Oct 20 10:01:21 2017	(r324798)
@@ -101,7 +101,9 @@ SYSCTL_INT(_hw_usb, OID_AUTO, power_timeout, CTLFLAG_R
 #if USB_HAVE_DISABLE_ENUM
 static int usb_disable_enumeration = 0;
 SYSCTL_INT(_hw_usb, OID_AUTO, disable_enumeration, CTLFLAG_RWTUN,
-    &usb_disable_enumeration, 0, "Set to disable all USB device enumeration.");
+    &usb_disable_enumeration, 0, "Set to disable all USB device enumeration. "
+	"This can secure against USB devices turning evil, "
+	"for example a USB memory stick becoming a USB keyboard.");
 TUNABLE_INT("hw.usb.disable_enumeration", &usb_disable_enumeration);
 
 static int usb_disable_port_power = 0;