From patchwork Fri Sep 22 17:52:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143620 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5820526vqi; Fri, 22 Sep 2023 12:32:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGXV/7xX5383xCkg0Cc22MZkbcnSIWAYnKWh8d0N65etyqkUEFCEYZcq80LNPh7QEweMXpI X-Received: by 2002:a05:6a20:ce96:b0:15d:641b:57b6 with SMTP id if22-20020a056a20ce9600b0015d641b57b6mr502367pzb.5.1695411121415; Fri, 22 Sep 2023 12:32:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695411121; cv=none; d=google.com; s=arc-20160816; b=KBZkuoWJm6bJUUKNqrI7bOcGGSCn0hAshra5mC5AQAdOsdVWjHQAYhyy1tGwQaT7mQ gPihAecyWlXmAnTk0jlQz3OyJyOhKXdAGI/ade1OLWnnYkzm06Vhsj1lu+iwX6Nw9uff PyjbevBWOlQkjl30gPqmb55D/huF+ALgwpsw7d6oFY3hCo/LWwjswo2DNunVlXq3pmcj XbmIYjb3hACZT11NrmKwzq8ksjTiewRG0fTw006BDnLQe7KHj/kkeOOc9r6bAGwQfsVd qit9nc8oC5tpRyBwfShvQMdzT691sQ7AsOhzpsrPT3WJa+beJgdF/WYvQrgb189j7xSK oOrA== 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=eKO7HZA7note+xxP86iPyjMQTezIOPPmqe4sHJnTuiU=; fh=wpFXWGr5IzIOVzSRWz0rFMlfCH6QXSNPndX974O7T7A=; b=exFftpzfpzJ0xuksn2XWOb7NpJqIif4qkY9KPyQVXZBIVtP8ue/BuCquH/vEBo4gIJ hGq9fUjdUKsJkqez1LH5v6SGc/e71Ls7htjRSkguvCgv5bo7nn6BxAr8mgBMpOQLg0R9 i4hT5+LMjKmXYOJgu2GlnEXYJf9zdD4V+1LSUqpmo+KapqPOfuZlqKaQltxY/CYCiut9 5xw9s4x53kDOp1pUjmoScEGfLc0uiUuXZfw+ZEjghrCKpGA10ARrz8DBIU33+2+Jszuj I33zzirg4T8NIxgagltr6Lc9MPD2+2zV/GPscssQsBuacN7UpsZ72iUaxu4Q9mE4nAR8 5g9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=chHLRQ3i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id bx27-20020a056a02051b00b00578a57cbe94si5193517pgb.318.2023.09.22.12.32.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 12:32:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=chHLRQ3i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id E8B35839E834; Fri, 22 Sep 2023 10:55:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233725AbjIVRyy (ORCPT + 28 others); Fri, 22 Sep 2023 13:54:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233861AbjIVRy3 (ORCPT ); Fri, 22 Sep 2023 13:54:29 -0400 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A6F81BF0 for ; Fri, 22 Sep 2023 10:52:52 -0700 (PDT) Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1c434c33ec0so21116065ad.3 for ; Fri, 22 Sep 2023 10:52:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405171; x=1696009971; 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=eKO7HZA7note+xxP86iPyjMQTezIOPPmqe4sHJnTuiU=; b=chHLRQ3imy6l+WvL3/9yPEvGEVvSJJW0yxJbVMVuXHzWOVShRXSo0P/rJ2VT6ODRUR eCshQqm3zy8L7phIxMpNSJMdWW7ZVRR/AEdfWovJRYUiDzwr/BeEVd0e0o1EwUhRzWMk 1tjAI4gMNE56/5fW+W3U5Q0y2L6ImFUnoj5mY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405171; x=1696009971; 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=eKO7HZA7note+xxP86iPyjMQTezIOPPmqe4sHJnTuiU=; b=GMHCjsX5Jh8mDPggVu4N4tzKyhXlWZbfcni+HxmnWdO4oNVsu7NKDZBgFj790L9w93 ebn3zSOUrkdJDjXEKb/xlHyMGmbA/Nqg3D439IzURwFacSJ4bfVo60qn6NHBZCG06SGY Y+uXY3Vdo1L6xgXjiASDBESvV6HX+3s6O84g5lNxCr1DC6dQ/3tM7s6o3DYVyl/ZyhnY zLQFiAknTn4U3xKF1xsW+sD5VAiNZkSU6k6UNLz4xcZfWHvvQuG+TdBeih0UrAT8PUAQ sbhUsxivUa1Lj12S831kH0ctCxp2UpGOQLXEvBfJppNvLrNCbBMvi/4CLWVsNYdBDMP/ dcIA== X-Gm-Message-State: AOJu0YzCAPwooCROu2CoKF5uTB6LsW4vmAMzdMVmcEZfIE3n9eLzX9Qx /OtdnyKP4UgDBveIaI6RXmw59g== X-Received: by 2002:a17:90b:b05:b0:268:352c:9d13 with SMTP id bf5-20020a17090b0b0500b00268352c9d13mr496040pjb.0.1695405171425; Fri, 22 Sep 2023 10:52:51 -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 z2-20020a17090a1fc200b00263b9e75aecsm3834838pjz.41.2023.09.22.10.52.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:52:51 -0700 (PDT) From: Kees Cook To: Maxim Levitsky Cc: Kees Cook , Alex Dubov , Ulf Hansson , Tom Rix , Len Baker , Dan Carpenter , "Gustavo A. R. Silva" , linux-mmc@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] memstick: jmb38x_ms: Annotate struct jmb38x_ms with __counted_by Date: Fri, 22 Sep 2023 10:52:50 -0700 Message-Id: <20230922175249.work.593-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1429; i=keescook@chromium.org; h=from:subject:message-id; bh=IYB/5z7VQPpaTtnk20ryAqWUCT0rzInyLePi0vxIKHI=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdRx1X2xU9/fAJc4ZPAebmwE5hH3qrgWsM1dw vLMDlH/bXeJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3UcQAKCRCJcvTf3G3A JmkPEACRHShf/0k3dIPbAkc3C7PfZIdI1FQTAFGzE/GaNVBsm8T3tTI5WyNX3UFKuEjxENQnu1i cIYrj0Y3gqh34Y9l8ITYPOB/LSIlCaUWFZnvaTXa45XGrQbSO56fQGjzVUrUCTh/8CVTrNd7Tos hNTn7XpmKZh9ZnJhKI88D5dF7sBRTLSe2ONhHcLmuBtsJ0EYUARWlMX7NprBWotDGgYR3p7JrzZ 81CmSQ3dCxRW+Yf3wKwwsIKcFsH/7LnYoC3GflvxAh7ux8B7/1GWu7yiZC9tMdwIYeTpQE7jFKZ dTcqeNNIH6RqJvX2Sn5Fy3/iHIZgETt5fYlYXbn0hLbBJV5JMu+sKBGjm8LaGIdtlq9W+CAOVEz TVy0Z9o7xicwh/FMfEouStlbJBn+2kyVUy0ahd7OWlXKaS7ARVyD36XPJ2XYQaCSbhHhZC4kA8I m5cI+RxKRK3fvFjkS3RoWpKXCH8gTrrp9Vl7LwUjXs0YouI3xIdbmi4JF2pg61MK6onmsXLIyKl vQuZCZ8SADPi3mumw+zC78p62HxeGpgHUhyUC54yRGesI4P+D8b2jZd4yFmUxY0RU5hC/DDPE9B EkMVoryyGfhne1hZmeF0BWN2XMnP6xpRHxsSOLzQCsLowor7oQ0hoqaj1Lasy4pG7CSZQyHwyGw 0S0YD41 /KOE3bOA== 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,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.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 (fry.vger.email [0.0.0.0]); Fri, 22 Sep 2023 10:55:08 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777767412174448125 X-GMAIL-MSGID: 1777767412174448125 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 jmb38x_ms. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Maxim Levitsky Cc: Alex Dubov Cc: Ulf Hansson Cc: Tom Rix Cc: Len Baker Cc: Dan Carpenter Cc: "Gustavo A. R. Silva" Cc: linux-mmc@vger.kernel.org Signed-off-by: Kees Cook --- drivers/memstick/host/jmb38x_ms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c index 21cb2a786058..e77eb8b0eb12 100644 --- a/drivers/memstick/host/jmb38x_ms.c +++ b/drivers/memstick/host/jmb38x_ms.c @@ -66,7 +66,7 @@ struct jmb38x_ms_host { struct jmb38x_ms { struct pci_dev *pdev; int host_cnt; - struct memstick_host *hosts[]; + struct memstick_host *hosts[] __counted_by(host_cnt); }; #define BLOCK_COUNT_MASK 0xffff0000