Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5854743ABB for ; Fri, 22 Sep 2023 17:52:02 +0000 (UTC) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1c44c0f9138so20958735ad.2 for ; Fri, 22 Sep 2023 10:52:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405122; x=1696009922; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RWuKWOMrUoMzQOCKPflMbS6ITer2hgabTUg3ReQt9No=; b=QQMMke0K0J1gFh0+1DhLosqyks06jcRwabUwiWRmsL/qdsOSyjmQhxNhcvIDIK6rAU tQMg1KVDN8pOPaVv7VMtDAHnz6n3ltl1kK2V3SfeWDzD/F4xYbJeNEv2Kny52bvvF85U bQb8yHYpndP8Zsky3cPpEd+3RfaWnY1Q9hQWk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405122; x=1696009922; 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=RWuKWOMrUoMzQOCKPflMbS6ITer2hgabTUg3ReQt9No=; b=PsVP5+jyJfQ8lv5yK3sZkUQ36PwTbijB5X7uz1scCW1UM3qPRIN6t5kc7qbotq/HGG z/T7gjGy9GEtbnk3sN9ppP8ThbrcHOAwRiFZAbRkdoPUFkf7HFRwVvyC7fL6cMcEka0x P+kV2qRBpLaYGeY6/ZrxfmkbkguqP4xrBGTxfQ5h5gCpHHjN/wBRWRmiSRiT03ihlXt+ 3VqWs6TRLcI5LhqZWMpTzC68VLQgtD+TVcbpfzkLHDUSJeLOwYoG7xA54iglBcflGCf/ J5IcOwmi2oQLq+lsNPwxLZCD9hLxkdxdrJIkJP09n70M9/qFGDzmAk34i8dj/GyauxtX EWew== X-Gm-Message-State: AOJu0YxrzKEozWM066qfF1/BnRqwUwu0EffmCKOzEnZoHZDPXt4lCorm DYMAZm7+H3gd6Mfilcwi4r0qBg== X-Google-Smtp-Source: AGHT+IEEYqGk+GvFAAFqlU+6AHitWBEIi3aarNhM7dp2OV5ey+MRAhoWBJPSVmg4F4cknSaQafnbmA== X-Received: by 2002:a17:902:7449:b0:1bd:d141:f02d with SMTP id e9-20020a170902744900b001bdd141f02dmr149532plt.68.1695405121759; Fri, 22 Sep 2023 10:52:01 -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 h11-20020a170902f7cb00b001bf2dcfe352sm3765524plw.234.2023.09.22.10.52.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:52:01 -0700 (PDT) From: Kees Cook To: "David S. Miller" Cc: Kees Cook , sparclinux@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] sparc: Annotate struct cpuinfo_tree with __counted_by Date: Fri, 22 Sep 2023 10:52:00 -0700 Message-Id: <20230922175159.work.357-kees@kernel.org> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1141; i=keescook@chromium.org; h=from:subject:message-id; bh=n9z5FmRNgXALjcjtTQwP0uj0mQ0tiOVTP5YW9P7FSeE=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdRANuxw/YOVkfMe7fQoYeuhYtypfWJE9rimR 0W611Y2NtaJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3UQAAKCRCJcvTf3G3A JvZfEACAwkw3Hbs4govxC3WH2lH4Hlpz7sGJadYiUoHt+PpNm1GGCy0X2+FNwHI0OvGsu9RRnW5 H77B+r/0dOLQy/7GkbzM71I5kXTTFiqUZQHDQhHHLefLxR/GjWfuvRNSjlzzAwWeritamzNkyyG 2sdXgT4uvBxosTfIDag0gWNP3IBDh09NIcjHzu+6Xfmkbc+aL+LPFixecuNOXi3K/GDnL7w5iKs RLmHm8t9Ur1Q36dEIiG8mEJcb1lzjJcv+c6vJKDy5y1yCo4Blhl4eF8gdv85j4DbzYDgVVTTWR+ 504vVs9PwUPQe+iNm7jTefR4LBq7wY9RFg5p5URg0LrGQcth+pgkgF/pkolKbjorxKOgfU+Xbc0 QHT0O6eCUce78B9Owa/I7lfPPginZXq+T3ZyVdbsEwMEoE0FMX3j3eokoiCmVdTtPspH0qxP4Yu mrfqBcFSb2TKL7W53hxYUQLOu2/YQs9fY6YKKSrk+soHZD3RtJnhNyfWN1ThpQsZK033DO89J33 jgTZd1Mni09sKB4DZIr5s5a8Ughcn20T1kEtDI+iM6E5ih0ViruyRUWmYME5ZWuwJ4jHHsaQC+9 vq3QlCxhToa/GF2Tv1tc7yvQFuCHpBmU7ztDcVockhlYwa1vlLWAVr0KA6FPi0Yuv+hOq0tBOnN ig4Tr54 MXlUMSWw== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit 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 cpuinfo_tree. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: "David S. Miller" Cc: sparclinux@vger.kernel.org Signed-off-by: Kees Cook --- arch/sparc/kernel/cpumap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/sparc/kernel/cpumap.c b/arch/sparc/kernel/cpumap.c index f07ea88a83af..8fcf2d8c6bd2 100644 --- a/arch/sparc/kernel/cpumap.c +++ b/arch/sparc/kernel/cpumap.c @@ -50,7 +50,7 @@ struct cpuinfo_tree { /* Offsets into nodes[] for each level of the tree */ struct cpuinfo_level level[CPUINFO_LVL_MAX]; - struct cpuinfo_node nodes[]; + struct cpuinfo_node nodes[] __counted_by(total_nodes); }; -- 2.34.1