From patchwork Fri Sep 22 17:52:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 13396257 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A97E74446E for ; Fri, 22 Sep 2023 17:52:44 +0000 (UTC) Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1143FE6D for ; Fri, 22 Sep 2023 10:52:23 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-690b7cb71aeso2114604b3a.0 for ; Fri, 22 Sep 2023 10:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405142; x=1696009942; 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=tUfG5CM9LeO6dcNwDkeYkSibXZr9XVodXzzx/nCur9U=; b=BQOY4m9VSZQt7HPokJQmy5539fTULs4DI5vdLHyW57g1+f3E1uUeTJwAdawx8teV28 bVbvyPkwfr6xurEDY2Qzu6GmBs0Ey6qyNSECpAJNLxcyQ8H8qN+8VdYgcLw3zT7TbzLG NLzv+1ggOQk7R3avNi+IIzRjiGgSVh4U2atE4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405142; x=1696009942; 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=tUfG5CM9LeO6dcNwDkeYkSibXZr9XVodXzzx/nCur9U=; b=uGUK6w2tUhN33/H1AV7A3xeJsqBqL5cwVENs7lF28a/aoU1J011mguaW2DcJ51xP51 0SfkYYvPGQ51o6ZD5IYoq0GoqpRNkRbC5vIPuEtXh7CI9T2hWepGKLBuJJoyTvfESUJj mC/Dc6fUdUxt5sy93g28gGxtMvJ1R4SbWY0LvgSyR4VPHzKG7x4DA7d3pDRS3xTKlJMU zevykrYwJhE+tThyv/l4fVfrRQWkRnguQWXBtMXK+eTw60zsVEB8KlQOn50HhMQdt1JB WXLh+2MiaKkwljZAxqKkvijmsMZbEvC8GOxXcOAo72552XUKcTgrxeTMJz9vIbLwRVkt n9og== X-Gm-Message-State: AOJu0Yx0lyoribxhdJIPKftdXBZVtiDLXMFFyJi6oSVEPfnsCdtuNwca 5AUVHoG4EqPKiS9Fq+UTbe0MhA== X-Google-Smtp-Source: AGHT+IGKglSu4V94OTI3A3BfgAmZCaaFTkJEerKkiQY4tQfjHtM7Ae884UZbgp+Yzv55o7c6aErRvg== X-Received: by 2002:a05:6a00:10c6:b0:68f:cb69:8e66 with SMTP id d6-20020a056a0010c600b0068fcb698e66mr459676pfu.15.1695405142449; Fri, 22 Sep 2023 10:52:22 -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 c26-20020aa78c1a000000b0067b643b814csm3492756pfd.6.2023.09.22.10.52.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:52:21 -0700 (PDT) From: Kees Cook To: Peter Oberparleiter Cc: Kees Cook , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] gcov: Annotate struct gcov_iterator with __counted_by Date: Fri, 22 Sep 2023 10:52:20 -0700 Message-Id: <20230922175220.work.327-kees@kernel.org> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=981; i=keescook@chromium.org; h=from:subject:message-id; bh=PERykbPQFb07CtyESuEWnJKmw1X+EsX8MBvMPSKrxC0=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdRUUa78Ww0nV8tm9uBXdH6YFNvrlgq4vOUD0 VtGGM7H0YKJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3UVAAKCRCJcvTf3G3A JjQHD/0UYfkg7/bkKyRZFzhxwcMCFxcRlEeqzLk645U0ZI9EVsp4jndBVkZ+iw5IwU7aRrq18L4 8aTvCwK2LSM+TXSQ8bTsckVKhNNC2LEGdGcAyzEL/6uZySyr82kR0W32JBSwA20fgzjCLrWuAFt TQ3l7yy/5NyAQ3IZEpHGDbmkIJ/iP2jTes6eXQdljIfv1L5kiIl8A0N6X3abxTan8idIaE5qxSX g8VVf8vZabxyp39MNdCrALA6b1RO1NBanmP7mDPpMGrLaf71Y8+MQ32jntnDIyDMvCnHUjx2B7N M1IV8C7rGNxLJjH3Y/ZUFmea19f7lvgs3sIDi3WzY4YTfTN0LvJRVkzLfiCTJGdOgYfmYRqvYkX 9pi6sgaIlCb3ZejdLb3fibwDBT/+5/Zj04mn3bFSH+YQk84KYrPmaQ9CqUtPT2Q3OsBpdABJkWi g6q5MiqogBKcHYYiBm4dBjJ9f8SDDGHRSen2a5mm9TPRZrj+S2rE4JDMefGMdPfr4JD6uGVoEfq z0+KSraR9tUXAi54bzPB5OBQfpZnjSHNkNMcqwTjIgJFuQ/7UqQwn8jEQbaLLQSePHLGeK5qiVO 6vLvyE4Pfwo8UClJmc6qkpfjX5dwtbbWcYFCJLcNshPGyxh2NikJOgh3xcwQJTNrZNWV0dX6Q+E Now+tQ6E ++kkCSA== 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_BLOCKED,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 gcov_iterator. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Peter Oberparleiter Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva Reviewed-by: Peter Oberparleiter --- kernel/gcov/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/gcov/fs.c b/kernel/gcov/fs.c index 5c3086cad8f9..01520689b57c 100644 --- a/kernel/gcov/fs.c +++ b/kernel/gcov/fs.c @@ -99,7 +99,7 @@ struct gcov_iterator { struct gcov_info *info; size_t size; loff_t pos; - char buffer[]; + char buffer[] __counted_by(size); }; /**