From patchwork Fri Sep 15 19:58:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 140693 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1321121vqi; Fri, 15 Sep 2023 14:09:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG6bGbzH5zc+QY0NigGdFKqhfh9Pb//gCbkexDNJgmW46Gxr0wDcSrufdS+ZZYyxkvNi+Dc X-Received: by 2002:a05:6358:5908:b0:142:d40b:817c with SMTP id g8-20020a056358590800b00142d40b817cmr3416679rwf.2.1694812190809; Fri, 15 Sep 2023 14:09:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694812190; cv=none; d=google.com; s=arc-20160816; b=XcDdZZLg2RMCVRxF4CmN2agfWSugrYls+f4+GM0wu0wphrgHxxBoLgGVNNeaO7xVzZ RFntQU9kjSWWN5IYGYbFgq0ljxHp63r1VRrEfB6e4Ybd1pD6GW1jQaL80d7R8sJK/BMF pgyGLUvG3B1nPWCYQ1dYd9Ab9D64llBcbDX0VrMPvsUvctLQe3YYiAK+lDaUulcj0Nvq thNGUReh2mDYfq6loGORSZ6zP9vculEKciLMDXT/IO5i28bmy2fsUebB7edxWu+DaybJ Bg0EJjSDhRJ3pOhWxEoCpNb1EtS++POISO4LmyGrCJ8mi+Vf4oZCgDGfJvS02Vw+C1hT +DPQ== 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=9mvaVHg0XEhOTsWroaSMJTNrbWXg2FfhIFu4j+H929s=; fh=Jmp5adbMQmom1rdVUd5mc6S/EpnZvjiOIPr+hhfecN4=; b=RVmp3GEMWfh4C5B76ZMs7MNPDV5ah8+xaIcsvVGgeZ3ofnYubA3bcXm4ETcesEi9kC 8O7YCgbVRCm1lwDxtETL/lSbOVSNSyjBbA/ZD16OVKeHxFXk0E8mx14RtzRZ5HphS1/X xelfY0Jx6lCdOiCz8y7OrtwupJIupaEy9KrE7f9mj/sVg0iBx64LdxAVclOwjY0f4lJL 9i7XLVDLXHakDnV+/HuKXDZul0bhJcrfXqGuKE0BZoexrJufB3gTwuaW5aTd9PfWUUJp Kt9rI64k+gqnJYGrah1KhS2dZXL6GTadz2GlWBH8FcIpjxkpAj/G57d9Nx67K3ZhAH6/ 0VTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Vtv+ys7C; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id m18-20020a637112000000b00573f7d7890dsi3819585pgc.19.2023.09.15.14.09.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 14:09:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Vtv+ys7C; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id 50767809638B; Fri, 15 Sep 2023 12:59:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230398AbjIOT7G (ORCPT + 29 others); Fri, 15 Sep 2023 15:59:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230046AbjIOT7A (ORCPT ); Fri, 15 Sep 2023 15:59:00 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9BE02120 for ; Fri, 15 Sep 2023 12:58:52 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-2746889aa89so1810081a91.2 for ; Fri, 15 Sep 2023 12:58:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1694807932; x=1695412732; 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=9mvaVHg0XEhOTsWroaSMJTNrbWXg2FfhIFu4j+H929s=; b=Vtv+ys7CSH5x+Fx8NA0tTY3M4pshhDlJLJ6H1d6VhObM1m5b5wih07gMVvQ8Z1V43K 5XD3+FYI2r8B+Bx/vJfe/t4YE9WqMPYmFPF1mU8QUdskUo/nN+TfRXWtNkO4A3Gi4AeU JYf1GvJkpArnU3S4DBnW5KUjUrNXjfJ1vawZU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694807932; x=1695412732; 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=9mvaVHg0XEhOTsWroaSMJTNrbWXg2FfhIFu4j+H929s=; b=vlRUl+aTr2BZDKvH6ZnvSIlQKpwiXY1WhyY0dQoo2y4jmGPBMZcsqrOgspLnZaYxM/ CbmIDklXMNgrpqNIIajJCtAvVIfZr9gMV6mSWgq1yIQAIuO6GLyRwuC+08IyNJPlt6gw PcPiYAhd/bC3vXKjt6RF75SlHMar5IoIElFLkgkhngcoV+bsZtFNPJYvXEVjlQyYXC7s ZxC9yUjV4MhDrFnXjpNFBtHk1zR5xgLPkSXZzJYFUaQmyEAu4Rlbjtd1jz0W9QoIMLOg GkY9Gda5zaFNTtM/rNuF4dBtnW6VeYHl7dukakZfM3xAnmIKRwYb0Dl1AWxX48a7kK+o GiGQ== X-Gm-Message-State: AOJu0YwYHe4IxbJPYLbww6/bGF/rakkyEyhE2BCtoi6kja1Lu0/1pXu0 on4TdqJ9Y3rcD0ppT61B1HahtA== X-Received: by 2002:a17:90b:118e:b0:273:4c57:a7a8 with SMTP id gk14-20020a17090b118e00b002734c57a7a8mr2448516pjb.16.1694807932473; Fri, 15 Sep 2023 12:58:52 -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 iq15-20020a17090afb4f00b002636e5c224asm3359563pjb.56.2023.09.15.12.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 12:58:51 -0700 (PDT) From: Kees Cook To: Greg Kroah-Hartman Cc: Kees Cook , John Keeping , Udipto Goswami , Linyu Yuan , linux-usb@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Tom Rix , Krishna Kurapati , Jeff Layton , Uttkarsh Aggarwal , Yuta Hayama , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] usb: gadget: f_fs: Annotate struct ffs_buffer with __counted_by Date: Fri, 15 Sep 2023 12:58:49 -0700 Message-Id: <20230915195849.never.275-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1309; i=keescook@chromium.org; h=from:subject:message-id; bh=eL0i+HiP/slkBuDdJazClpDx64qWyMAqWkmawhHng5g=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlBLd56MZVta8tY42c7tMTyLS7qSe+Nf0e7Zm7F jrnBGfx5vSJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQS3eQAKCRCJcvTf3G3A JhSpD/4t0mJx7TYSiK5olhOCEucRjN/ZNuGdpy6IFT4GH/acg9kkJAPfX0JpIje/rvn3j+DhuUO fH3CWGN0o10V3xd2ciL59u04ho6iF0mG1MOSp+OnsE9xfVBCAQfNruRlDVyRENhS+/z4Io+1SvP l0TP8hpU+5TUl7Zy0oGfiNJL0Z415u5Lqu+7FOgJiua6S49DwtklzXaFwComGg0e1bH9wEYoB1s +D6tRCDcPTRz0dkDuplAjTdXsCsQJRvaCDJ+qqxYqRO+VwF8SLOujWl0bcoIhT4GWwGEtZzpNqT OiUmymTkI0NpNmkS7xjdt4Wn3lK2fPoItkkaPz5oxOCct/iq2bHeN9+B+RSw5eyAYKWawvfI1iB mIDM12iCWpXLeMvUPGYaWClXNr5lxPjTb673viG2rg+Tsgo9AsGJh6pO5RKnDRT/vBAFflO8ckx AYLYWXK4wF+w7D4nArHPe+HaIeJT8sCO+GM18mbUx/fTmZl50UNKGE4W+UskJOI4KrpC8TYYQF/ 3v2LCC1qbkZbU0liGXGzC0DIDXNrwAcQPOxVRCMl1SEAslksgXA3pg/68lhepMyisRqewRUMYYJ UrajslA5m5q33PN0H5nC/LgV5zSGrqxYSXzv2Zr6QHzW66SKBVUhKJbXaOqDfH97IlGaI8ghjG2 TTC4EPR H5+sovXA== 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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Fri, 15 Sep 2023 12:59:52 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777139387969407303 X-GMAIL-MSGID: 1777139387969407303 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 ffs_buffer. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Greg Kroah-Hartman Cc: John Keeping Cc: Udipto Goswami Cc: Linyu Yuan Cc: linux-usb@vger.kernel.org Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- drivers/usb/gadget/function/f_fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index 6e9ef35a43a7..af400d083777 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -202,7 +202,7 @@ struct ffs_epfile { struct ffs_buffer { size_t length; char *data; - char storage[]; + char storage[] __counted_by(length); }; /* ffs_io_data structure ***************************************************/