From patchwork Fri Sep 15 20:12: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: 140891 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1442385vqi; Fri, 15 Sep 2023 19:38:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHP3AZn81L4wbnUqM8e7+J5i8jqrzx1/eVK21jbQMEY/jntWPa/dYe5YYCpFczhfSIrpJ7G X-Received: by 2002:a05:6808:20f:b0:3a7:540f:ca71 with SMTP id l15-20020a056808020f00b003a7540fca71mr3810754oie.53.1694831928218; Fri, 15 Sep 2023 19:38:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694831928; cv=none; d=google.com; s=arc-20160816; b=OQsTd7trIMcYVSXU0KVTcEO4ezxHKvQuPeS6AkYYPLRDIR4reJKBX6m+iI9FA48zRW HG9Ld3r9wsCQl4pGKMFWmbcr8hAmDAVVWK+yAQmb0CBgklicB38P4sfPM9UMLXJXdJ8I XM4fkqlidccu/n6Ws7d+hqsEcHm6fW3021sv39Tu7mj0DLtqSNuUhZ6EOzxiNLrSzH+d wSX++ePb48K8YQJfn4No7X5YUpjs215NvsZVXtlqKMw7a4hjQSnE81RtYLgezjf4mz1l CJB3ti48Z7gxi7aNo8e4g2kaKGA1yQkbxLKdp+X5At1zeBlycBejySz9vNTdqYyys2IK Jn1g== 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=0w8YyWBkyxxpFXFEsJXWeSdcXhaKX7qg2CNvqyy5fgg=; fh=nGJKG3pr6OY16S95wRPUovkR53BH08qwVpICWFhZFcw=; b=J0wP6MMMNeilV6Zoqi6pupoLGSI0lJeAx1P5ai/kwL1qst3t5EjnsajjYL0jKNhBSK /aLESagG8/yu1nNK8r/SlF66+YvGTxCGVvopB563BdQSvxre6Z5dj1KI+7z6bPzFRA4i mCY+snGZobKnW/KllR9z7o3v4fHLfGxPaGuH3JWcHc7n3ugYf/tn03ECBtyBWONL2Z+Q bfzJGF55urvwfs53rCfWhmle9AXzIP/gH6EBvIC/0PJDP0m8mpFCClnxWlGt7ejHxOXK 6v0TwTdvUxB/dC1/wqLVKzsqnf5mR+W8kl/ZTVGQx6141K7oPE8lNPpqf7FWBnaDg2q2 cq8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=RyDAX7AC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id p7-20020a170902e74700b001bba564e2d9si4424948plf.0.2023.09.15.19.38.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 19:38:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=RyDAX7AC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 119CE80293F4; Fri, 15 Sep 2023 13:15:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237361AbjIOUOS (ORCPT + 29 others); Fri, 15 Sep 2023 16:14:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237239AbjIOUNk (ORCPT ); Fri, 15 Sep 2023 16:13:40 -0400 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA4182D4F for ; Fri, 15 Sep 2023 13:12:51 -0700 (PDT) Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-68fb46f38f9so2431574b3a.1 for ; Fri, 15 Sep 2023 13:12:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1694808771; x=1695413571; 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=0w8YyWBkyxxpFXFEsJXWeSdcXhaKX7qg2CNvqyy5fgg=; b=RyDAX7ACq5A92wSogwHmcvX3MKIc9KfQi0TZijDBgFjz2xT/h3BIZBqMAmzR4D2i6Y C/UJWt2DcZ7/vFrTfxp32PyUoOKV9vpq04fYLUeDvmk44vQDsqM0W3dv4qNPbgT9uVtU CfSdr2ZMBv/oIeEMbskzmmep/TqGctkGhQJDM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694808771; x=1695413571; 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=0w8YyWBkyxxpFXFEsJXWeSdcXhaKX7qg2CNvqyy5fgg=; b=vccrkkXWYehLh8Rm8QkL81Cse3dcIJVfpC/fksDNLSq3SDhxeQEY8DCM0oWKbpkerD XAJVpGxfLSyOQmSfxvLnqudV4vJt+hkEehoS7psNh+CeCjNhwa1Ytg5md3abIzb0SJyo VKspmbVXqs4QFj4xva0qCPsaJ34EGmx/N06E8J7xTBn1BzTJ9KoUPDn4Hr0hjnFsQBmT H8VXXHlufpPVH7ZvcSu9RbIIcb7qqKvo4eO0ngC+XPnQHhfTIMTcgIUTq8N4X+PeoIZm cOBQZKn/6oiir9yxUBvjXG9lQo4dI3k3E6xAGmhyy4mPIMyeHRkXPY+vQfKt/b3TJO3y 6KiQ== X-Gm-Message-State: AOJu0YwnA28T771OUCHhdP1v9k2/oPaWovLI9vMryf+hKvXbWAmJbVLa KvJTI9JTzAP45Wi1D2BcZJn2QA== X-Received: by 2002:a17:902:ecc5:b0:1bf:13a7:d3ef with SMTP id a5-20020a170902ecc500b001bf13a7d3efmr3048022plh.66.1694808771246; Fri, 15 Sep 2023 13:12: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 d9-20020a170902854900b001bd41b70b65sm3864242plo.49.2023.09.15.13.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 13:12:50 -0700 (PDT) From: Kees Cook To: Liang Yang Cc: Kees Cook , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] mtd: rawnand: meson: Annotate struct meson_nfc_nand_chip with __counted_by Date: Fri, 15 Sep 2023 13:12:49 -0700 Message-Id: <20230915201249.never.509-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1519; i=keescook@chromium.org; h=from:subject:message-id; bh=viN3aFTUGlYqsHbJQcNa6oOS8nJqeFdRFpqtC0E5D+8=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlBLrBAAO11BUsQ+oKxBzlepi1zMsCl8lRLHvB4 qk/2KM3zKKJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQS6wQAKCRCJcvTf3G3A JtFUD/4hfU9qPge0NwGnOrmrFpYmEsF1rZXGB7tjkgsjW4R11jE9il/8UIN9g8stacwGCBzLUSS mH+V4qUpwjDF0Vgztzj5EOz7jL0SUK05t+kAfxhir1eu+TnBxzScuL5kBFOGrCgttmRtseZC1QI W+9JjUA8xzBc0eX1m4eYJ0HXcBky9b9mgpiVTgrh5ZL5aFlaEXos2XiL4dRwbR5e72Zb3wUCnDv yMj9FU25KEJUcfcKLFE5fwvgnTk4zYKoVa001Mc8YJgJAxBrKtX9htMtzaR4HmBK4KEEkMnMehB HVDtcTnjsrQ7AmRrkuLkAj1Bah6SCH5LQEhEg0xmyLSD4csxgBeBSJ4a6wbKdwMAzkIbm1o5ACt NqIVZYqLASf787XFgOE8PA+1FJHr9EnDESUCgjWz64KdBIhs4l2CJyA6id6v3XYLU5vzdkJrAqK HJfrvwTc7Bg2Vs1RoOyXRXGcdwYb4stM2Vp0f7BGUhvRDk5F+Vh6M80kPxS/rJwv+KWuAeCipEw RWcbhpHBVe4oPJ/HWaMDO+RcXNJscIUwz7fU3UMhLSggbkK/h4czEGJTOmpoOncxQK921laWWKB 59G8tSqmjF3lRjjxBh3wvyKvp8D/Fiu7/pHROejMOREf89AymCCZDQtmwn6ug7Eu9gcc3qEKHQm gzt6Re4 SCuWvuVA== 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 groat.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 (groat.vger.email [0.0.0.0]); Fri, 15 Sep 2023 13:15:08 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777139001292952103 X-GMAIL-MSGID: 1777160083757538140 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 meson_nfc_nand_chip. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Liang Yang Cc: Miquel Raynal Cc: Richard Weinberger Cc: Vignesh Raghavendra Cc: Neil Armstrong Cc: Kevin Hilman Cc: Jerome Brunet Cc: Martin Blumenstingl Cc: linux-mtd@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-amlogic@lists.infradead.org Signed-off-by: Kees Cook --- drivers/mtd/nand/raw/meson_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c index 25e3c1cb605e..378f28ce6a74 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -128,7 +128,7 @@ struct meson_nfc_nand_chip { u8 *data_buf; __le64 *info_buf; u32 nsels; - u8 sels[]; + u8 sels[] __counted_by(nsels); }; struct meson_nand_ecc {