From nobody Thu Mar 17 12:28:03 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 699DF1A2515C; Thu, 17 Mar 2022 12:28:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KK5yW2JCCz4r05; Thu, 17 Mar 2022 12:28:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647520083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MXCtMjj8MKEIg/AmJwZxh8Q9k0whRTAMCQ+4ACx3gtE=; b=PLLlYpEvemaOIK5DvFSOus6KBQchXmSzG559RC4Ool+RCkXuiqJcNYPdEDE8+v3wIQB4Rw qOEDfFAQoiFieZ0onotR7HOLQqgTYJlY3T4+j108Q+StlQ/ZTl69TWNi0iqKtU4Hr+HEnA O42kIpwxkv6cvEjGzrOLSRdZwmICoKueW8pfaDNWqz9xURYROpsi/JZol3+EjWH+bRev3G n4juT4vL3OL9fd9QkD4ZezudHmWf2awu56S9fOqSLArXftE7JAHfm5yxLKVwFjqFvQ4K6e q8ojsXen0UB4qb10OsDLGDDNQ2rv0mqh7Ukk48pCCRxMl7qMyeA3WX5mjgMMtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2EAEE2608; Thu, 17 Mar 2022 12:28:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22HCS33c083687; Thu, 17 Mar 2022 12:28:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HCS31l083686; Thu, 17 Mar 2022 12:28:03 GMT (envelope-from git) Date: Thu, 17 Mar 2022 12:28:03 GMT Message-Id: <202203171228.22HCS31l083686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: d38eb015429a - releng/13.1 - usb(4): Factor out the usb_check_request() function. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: d38eb015429a9b7887e0ba57ed28846ec77a636b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647520083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MXCtMjj8MKEIg/AmJwZxh8Q9k0whRTAMCQ+4ACx3gtE=; b=XNbyhjdDN6n+zfWH06hxYe6U0FtOa8Gm9LbV4dJC0x2pYG6ZKCoJyR3gMLCl9gbsXPBmwY VkPWyrtFsR7xvQvhTzEgPn4GFAGRubAbkjpneSLG/JSjNgldOW3ulPVD4tLZ8M9q9p9Ry4 KrhhBwo4X8s9/vLCEcsso7I9kce6RqnfPxj1dvuHfO58e1HWJ0eyGLHM7mmf84aTkW1b9u XztsRaBDB+EDY94PfEVLipmuDMdZOVidB8qD1plb7+CfmRE88lvtqeoDDduKfk+A/tFb1z ESxGzmYKkZd5gJcDVmQa9cUsRsg5u7O47PfoYCknmzdmwuhJXYk68k6aycMhSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647520083; a=rsa-sha256; cv=none; b=iVXoKDFuv3ohKNaFpSjo1qmcmQFSdW0/U4TEZ7l6OXquns8iOCKcA0WRX4REhZJKqLpB6a yMR5LE6QssruAtudO4lk1XTq8KpQf089YuZUOKCxx6AYq7DhE6VrF0lHjelbMo9qdL7E9A 3OQSpwqV09eQZsxE5kvbQ2kCGea8JM8BYLHA83cEjpBomNMiLcRIIVWABOZXgCr6VAkH3H ac9UdlQrNxnyTr6QCwJFHKtJ6l7ofl1kMzdb+3PIvmnheb7tsgNCImFQngymtwTO9dxALb WRekJt1paUREU/9z3fONjlimITM6EkQ7071nesKj5mfqX4NohRGRG5x0RR0QIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=d38eb015429a9b7887e0ba57ed28846ec77a636b commit d38eb015429a9b7887e0ba57ed28846ec77a636b Author: Hans Petter Selasky AuthorDate: 2022-03-03 09:22:41 +0000 Commit: Hans Petter Selasky CommitDate: 2022-03-17 12:23:32 +0000 usb(4): Factor out the usb_check_request() function. No functional change. Sponsored by: NVIDIA Networking Approved by: re (gjb) (cherry picked from commit 8ed5bb59e913c61e61a4232e8221f35256f72ad2) (cherry picked from commit 9157566d7ad58560c6fa0ba6c2b88587688ee02c) --- sys/dev/usb/usb_generic.c | 54 +++-------------------------------------------- sys/dev/usb/usb_util.c | 51 +++++++++++++++++++++++++++++++++++++++++++- sys/dev/usb/usb_util.h | 4 ++++ 3 files changed, 57 insertions(+), 52 deletions(-) diff --git a/sys/dev/usb/usb_generic.c b/sys/dev/usb/usb_generic.c index 65af2bd6979d..8c9d910ee92e 100644 --- a/sys/dev/usb/usb_generic.c +++ b/sys/dev/usb/usb_generic.c @@ -2,7 +2,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2008-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -862,54 +862,6 @@ ugen_fill_deviceinfo(struct usb_fifo *f, struct usb_device_info *di) return (0); } -/*------------------------------------------------------------------------* - * ugen_check_request - * - * Return values: - * 0: Access allowed - * Else: No access - *------------------------------------------------------------------------*/ -static int -ugen_check_request(struct usb_device *udev, struct usb_device_request *req) -{ - struct usb_endpoint *ep; - int error; - - /* - * Avoid requests that would damage the bus integrity: - */ - if (((req->bmRequestType == UT_WRITE_DEVICE) && - (req->bRequest == UR_SET_ADDRESS)) || - ((req->bmRequestType == UT_WRITE_DEVICE) && - (req->bRequest == UR_SET_CONFIG)) || - ((req->bmRequestType == UT_WRITE_INTERFACE) && - (req->bRequest == UR_SET_INTERFACE))) { - /* - * These requests can be useful for testing USB drivers. - */ - error = priv_check(curthread, PRIV_DRIVER); - if (error) { - return (error); - } - } - /* - * Special case - handle clearing of stall - */ - if (req->bmRequestType == UT_WRITE_ENDPOINT) { - ep = usbd_get_ep_by_addr(udev, req->wIndex[0]); - if (ep == NULL) { - return (EINVAL); - } - if ((req->bRequest == UR_CLEAR_FEATURE) && - (UGETW(req->wValue) == UF_ENDPOINT_HALT)) { - usbd_clear_data_toggle(udev, ep); - } - } - /* TODO: add more checks to verify the interface index */ - - return (0); -} - int ugen_do_request(struct usb_fifo *f, struct usb_ctl_request *ur) { @@ -917,7 +869,7 @@ ugen_do_request(struct usb_fifo *f, struct usb_ctl_request *ur) uint16_t len; uint16_t actlen; - if (ugen_check_request(f->udev, &ur->ucr_request)) { + if (usb_check_request(f->udev, &ur->ucr_request)) { return (EPERM); } len = UGETW(ur->ucr_request.wLength); @@ -1105,7 +1057,7 @@ ugen_fs_copy_in(struct usb_fifo *f, uint8_t ep_index) return (error); } } - if (ugen_check_request(f->udev, req)) { + if (usb_check_request(f->udev, req)) { xfer->error = USB_ERR_INVAL; goto complete; } diff --git a/sys/dev/usb/usb_util.c b/sys/dev/usb/usb_util.c index 8a85bf6506bb..b333180b6551 100644 --- a/sys/dev/usb/usb_util.c +++ b/sys/dev/usb/usb_util.c @@ -2,7 +2,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2008-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -223,3 +223,52 @@ usb_make_str_desc(void *ptr, uint16_t max_len, const char *s) } return (totlen); } + +/*------------------------------------------------------------------------* + * usb_check_request - prevent damaging USB requests + * + * Return values: + * 0: Access allowed + * Else: No access + *------------------------------------------------------------------------*/ +#if USB_HAVE_UGEN +int +usb_check_request(struct usb_device *udev, struct usb_device_request *req) +{ + struct usb_endpoint *ep; + int error; + + /* + * Avoid requests that would damage the bus integrity: + */ + if (((req->bmRequestType == UT_WRITE_DEVICE) && + (req->bRequest == UR_SET_ADDRESS)) || + ((req->bmRequestType == UT_WRITE_DEVICE) && + (req->bRequest == UR_SET_CONFIG)) || + ((req->bmRequestType == UT_WRITE_INTERFACE) && + (req->bRequest == UR_SET_INTERFACE))) { + /* + * These requests can be useful for testing USB drivers. + */ + error = priv_check(curthread, PRIV_DRIVER); + if (error) + return (error); + } + + /* + * Special case - handle clearing of stall + */ + if (req->bmRequestType == UT_WRITE_ENDPOINT) { + ep = usbd_get_ep_by_addr(udev, req->wIndex[0]); + if (ep == NULL) + return (EINVAL); + if ((req->bRequest == UR_CLEAR_FEATURE) && + (UGETW(req->wValue) == UF_ENDPOINT_HALT)) + usbd_clear_data_toggle(udev, ep); + } + + /* TODO: add more checks to verify the interface index */ + + return (0); +} +#endif diff --git a/sys/dev/usb/usb_util.h b/sys/dev/usb/usb_util.h index 87e54d35150e..1bb20b86914b 100644 --- a/sys/dev/usb/usb_util.h +++ b/sys/dev/usb/usb_util.h @@ -29,8 +29,12 @@ #ifndef _USB_UTIL_H_ #define _USB_UTIL_H_ +struct usb_device; +struct usb_device_request; + uint8_t usb_make_str_desc(void *ptr, uint16_t max_len, const char *s); void usb_printbcd(char *p, uint16_t p_len, uint16_t bcd); void usb_trim_spaces(char *p); +int usb_check_request(struct usb_device *, struct usb_device_request *); #endif /* _USB_UTIL_H_ */