From patchwork Fri Sep 22 17:52:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 1838415 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=CQcsYKff; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.org (client-ip=2404:9400:2221:ea00::3; helo=gandalf.ozlabs.org; envelope-from=srs0=/rmb=fg=vger.kernel.org=sparclinux-owner@ozlabs.org; receiver=patchwork.ozlabs.org) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RsfyL1wMJz1ynH for ; Sat, 23 Sep 2023 03:53:30 +1000 (AEST) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4RsfyK6vycz4xGM for ; Sat, 23 Sep 2023 03:53:29 +1000 (AEST) Received: by gandalf.ozlabs.org (Postfix) id 4RsfyK6swmz4xPL; Sat, 23 Sep 2023 03:53:29 +1000 (AEST) Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: gandalf.ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: gandalf.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=CQcsYKff; dkim-atps=neutral Authentication-Results: gandalf.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=sparclinux-owner@vger.kernel.org; receiver=ozlabs.org) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4RsfyK6nn8z4xGM for ; Sat, 23 Sep 2023 03:53:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233508AbjIVRxe (ORCPT ); Fri, 22 Sep 2023 13:53:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233603AbjIVRxI (ORCPT ); Fri, 22 Sep 2023 13:53:08 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D4251FFE for ; Fri, 22 Sep 2023 10:52:02 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1c44c0f9138so20958725ad.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=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=RWuKWOMrUoMzQOCKPflMbS6ITer2hgabTUg3ReQt9No=; b=CQcsYKffp4HrOBiIYLoQNbFd3ft+zzFGwKKnovcP+rTEpmiYh8Rb1xRbn4cHkE2+kW nrQ95I1NRrGhJSNKwxdYuCx+/R/sNZh6jvV0Bt7xedXgwJwCy9gzrvulIKFwlksZEpDe aNJ9jHv6YnOnGJK+c3ABuieE7le64IDA3zfJw= 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=Cgl6bXgahmu36Wzp4MkrFkQxa388r7YtKUH4g8EpyFuJL5BAoJjLCfSJHWEYe2w6Gw SgZ5SaOv9rKo3UYmOO1Ek88Vcjs/H5VEwC6H3x0EhbSQ4R+URdNer3ZnDsghowpTg36K AxZ/pCVwuksNhK6fDn/drYex48nZUyyFa06A4jIORSUKFuuK3clbXqOQI1XDoV/4tli1 PyBvKOFRzGEyBOT75Sc5MUcjZkgXK7NfFxMZx5mFCoe93IdhwkEyXxZWx19LJ79bV2p9 fPe6xwxm8rLALIujR7nNJYr4N9eHBfyjGZ3BsNHObzG4tVypSZCyHPnzUqo8Tw7YoTQx 7Gmg== X-Gm-Message-State: AOJu0YwZmklmKuh4YHB8PEORi1Hqo/1GbQx/eniSEtH+nYx0uWr9Nc+g nZJALnvd0BI/kZOnHZ7tTTy88A== 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 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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, 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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org 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 Reviewed-by: Gustavo A. R. Silva --- 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); };