From patchwork Fri Sep 15 19:58:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 140778 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1388295vqi; Fri, 15 Sep 2023 16:55:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGNqc8ETqIu6uxJXI68SJwkHCEBRbnL+Bl9wzPItajrHWcUBdN5DClqCPkQVxi/5NYxBIz5 X-Received: by 2002:a05:6358:94a9:b0:139:a0fd:780a with SMTP id i41-20020a05635894a900b00139a0fd780amr4214831rwb.12.1694822126167; Fri, 15 Sep 2023 16:55:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694822126; cv=none; d=google.com; s=arc-20160816; b=F1uYTO3qk/ITvclZLY9YBLMaJI2CfWBf12CwAv0dpvYkrlPAL4bSw+9VZfkPMm4HUk eMBv8lFyvtUQ1lKLuOHh3UVnitKTRDg0NSd+s/p/zh21OjpsW6iZog98jAAOwxp6hj1c SAnlNKbeieDIHZiOEHi4F3hRb+KccztmLJ85Wz/paKyhu7wVt7F6pPMAdssJYkK744Kt FptdDSU75ncw7kF+VZ7o8VLw2Vqog2uc//hXz8tufh6J04mfBUbRwV8BuLhLn3PapLRO zIUz8ngb8bxWH+nlDh0CjeI7YKcIvtBeUVbQGjkRBeHlD9UvU/OZ3PtQ+sLGDzK8/9oO CuRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=zmHM4psXavgvDfuezLrO35so+CBMe74SVmqgDqqj+X4=; fh=1lwtqLh/eZFBoxUN8K8Y6v9488k7bj9s0TpsDPN2Fsw=; b=s9S0rjtrizT9pjtOf6FwbHglG33k6fitxr08LlhMWTBRG5v3DNJ4wx7Q12cxTJLTZE bZ491JMHWWEAJ9TAwBXq8J2vzI4P7cQqXSSs8mzh4gIm3am3wRaecPFFNpxNzgYJ6PgU 14fyAiBNpDcPaweewLhSb8eUhR3ovr2WVP+mZ9JblidsrkqRSNCv5hEIE8Gu+ZlexJO4 arfxL5STK0Stwvg+yr64x0gqwy4fYR41H4zN1WhnyMKEp2j47Oc+I0vYFyrlTk25ErEd e5HWj3xkNyB//QjIzWHQMXgwufYCf9AR8lVf3/pOYWgaRURS0ynp/EVEbZVf4345u29M QTKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=XeTzfUDc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id t4-20020a63dd04000000b00573e329b014si4007540pgg.339.2023.09.15.16.55.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 16:55:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=XeTzfUDc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id EA5BA80238AB; Fri, 15 Sep 2023 12:59:10 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236585AbjIOT6d (ORCPT + 29 others); Fri, 15 Sep 2023 15:58:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236771AbjIOT6Y (ORCPT ); Fri, 15 Sep 2023 15:58:24 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1539210A for ; Fri, 15 Sep 2023 12:58:19 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-68fb5bd8f02so2471748b3a.0 for ; Fri, 15 Sep 2023 12:58:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1694807899; x=1695412699; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zmHM4psXavgvDfuezLrO35so+CBMe74SVmqgDqqj+X4=; b=XeTzfUDcCXCFkZBfDf1AQF1x3mA8sIj7CHRxo04V9HYErUCdABgWjOXgMTIJq8NWoY 7wFuMr9NS1ajAdoiegiAhtKqDxNzhZuOk+Gzbhm6eNS6sVhiQ0NVGQSAMQtOaxDyseNS C0t2IrM0pFi6lb3yQ8JB4dE73FqdW8j7RUNkU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694807899; x=1695412699; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zmHM4psXavgvDfuezLrO35so+CBMe74SVmqgDqqj+X4=; b=o4wCmupU3M+p9ssFFWGvZXL4VZzlAGmdwSyxqQ2aBxK478uiZASoo7KgQA4vEQO35C mZZbeRx10lqTZ6tmQgsKzc3KYJjjqmM7s/T6+9CxwAgETBgixwa627iuQkpNmM5+jt7I RxvJQ4b7YW540luuCAMx3SPM0YJU/x/WJWbeJRl3u4AsYc7Y+JR8tzziecNSFZ0LLDJ+ FiqMSI2zRVjCqZ3b/BOGEBViMcvLSKMraqnD9xgwEVjxgB2Cjr+mZ6XJN4iV4JMigg08 e3LRAkXVr6Kp3k+UPZwOv8gAVo2BHdIcnBIno6w553fZ2oKBWOCt96dCI8M7O3wJzvq0 tULQ== X-Gm-Message-State: AOJu0YyMgXE/Uu1xFpO9vuC41it1cmoiINjTq0NM2J+hvhKEjEhXbhMW idTyG/u1PxL/zsfH+Rrmb8OXjQ== X-Received: by 2002:a05:6a21:819e:b0:156:dc22:96a6 with SMTP id pd30-20020a056a21819e00b00156dc2296a6mr2747617pzb.55.1694807899302; Fri, 15 Sep 2023 12:58:19 -0700 (PDT) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id s12-20020a62e70c000000b0068e4c5a4f3esm3314766pfh.71.2023.09.15.12.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 12:58:18 -0700 (PDT) From: Kees Cook To: Alan Stern Cc: Kees Cook , Greg Kroah-Hartman , Mathias Nyman , linux-usb@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] usb: Annotate struct urb_priv with __counted_by Date: Fri, 15 Sep 2023 12:58:16 -0700 Message-Id: <20230915195812.never.371-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1658; i=keescook@chromium.org; h=from:subject:message-id; bh=/nlnwk1swWCmCy2+Sv6muF6tU55a2t3bsLZzpmMZ7jA=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlBLdYB58rdkB52xPa44fGOBHqVRz7lxkY6R3VI m+mHExbT+qJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQS3WAAKCRCJcvTf3G3A JmBcEACKNUOge0/I+8iiOTctI4cFdZB/+rB9Ls9SMAQ3HTYKIXbFV6eJFbPrC5AAdAGdsGyVCJH 8DDCbKRazcLtk/2vGPm6G5nR2FlXm/Rc/JndCygWsLpIsgWs9NMtm1QZlN2rag2TywAY5O66Pdn e6RWMDqHtBpjC8irzQ0bHTjkCF4IFlDefPhNEJFeuB9xZVfCsjs45uuDLMM2DL9DmxDIR9TztgP aEEPH9ULbxtxiUGrldBOLZpYAS6RnlApwMLXomqII99vwWZEXdECUAWH/AMjYlGDmeuuZdeCGM2 zfYbE44jcYqSKf2LHciFpDQOTXbr9CLIIUlc7UbO+S45hQONplJEJIPy8E/l2vq+7tCcVJTcslf vI7T7sGBuhZljTfaxI4E5EuKBMRLeO9Rna/e/MMp7lHnVerLm8cGrFa5+l+bcvTBsjFSozCuqsU Xqan6V+WOLZxOz96eqfXe/e7Il1H1AgAhJy+btd3mtJMRKNEm1TzihpBWwcJ7SESPCQYwGFkeIg iAws1DwbSOAIMRq0+yQ3wKSzcD+s2STzCWxnT71yFB1hSthlwFilQIvNlAkhUoEU5HNoO7arF5q mB6ZLScLXIEtDto8BDzvd/u7lfKIBnlFXEvMEkB46kXMRcjHBaNclSDin1SO3xY9Mo0CchESmZP 15qunaB jCdEo3fQ== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Fri, 15 Sep 2023 12:59:11 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777149805981492067 X-GMAIL-MSGID: 1777149805981492067 Prepare for the coming implementation by GCC and Clang of the __counted_by attribute. Flexible array members annotated with __counted_by can have their accesses bounds-checked at run-time checking via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions). As found with Coccinelle[1], add __counted_by for struct urb_priv. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Alan Stern Cc: Greg Kroah-Hartman Cc: Mathias Nyman Cc: linux-usb@vger.kernel.org Signed-off-by: Kees Cook --- drivers/usb/host/ohci.h | 2 +- drivers/usb/host/xhci.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h index aac6285b37f8..1aba22784e05 100644 --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h @@ -337,7 +337,7 @@ typedef struct urb_priv { u16 length; // # tds in this request u16 td_cnt; // tds already serviced struct list_head pending; - struct td *td[]; // all TDs in this request + struct td *td[] __counted_by(length); // all TDs in this request } urb_priv_t; diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 7e282b4522c0..2f21c3a8565c 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1666,7 +1666,7 @@ struct xhci_scratchpad { struct urb_priv { int num_tds; int num_tds_done; - struct xhci_td td[]; + struct xhci_td td[] __counted_by(num_tds); }; /*