From patchwork Fri Sep 22 17:54:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143657 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5860902vqi; Fri, 22 Sep 2023 13:58:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH3ClZV+KwyeuK0Mb+2RsAjmlX63DDyREpRI5y9CAFGK6MlzC5HGUQaDsVI8S+A4tCTbLAU X-Received: by 2002:a9d:7855:0:b0:6c4:897a:31d2 with SMTP id c21-20020a9d7855000000b006c4897a31d2mr846733otm.30.1695416296897; Fri, 22 Sep 2023 13:58:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695416296; cv=none; d=google.com; s=arc-20160816; b=SaCcylBCDykOi5AVccKDEZIxDzNZwrsz75Nbb1cDTYzlJprYAoCXhiLtUngElVRCvi DhA9KVEdQb3ZvJycAoY0uzCx7cqfPEsjV3OYm0xMjWDQVXySub1WPzZFTVT1B85JPx4z kc22mk1DBXgvM3+VcyawvqOpImC54yZsND1rr3YRTEk+kK7lGV4GP74nGrphKYp86NY0 VkhwJUNSzt5axKwdMVgmKLWOoDYtLd+Bk3xuR9FvS/0EmFxNfZNM88cVartufg8SsJG1 Eqmg4Y6FEug9QTAdH0PgtDHggD9isEaNRlt2WI8flgGUv+J54sX+NKPyJN1EA2hKftI/ ovwg== 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=1ISP2L+rvg6dxZG1wcmYnXloNsZywrTUtixv49IhJ0I=; fh=Z8IgHBcnIuzgclJUqDKeeCZEEXJIAxTHKYxZz2FJ4Ew=; b=DlkE8U42bVWOLzAOIf6DvRdrvsllh+93PY6eHEQg5872e2Jp23cGJ3Mkq3To7XsepZ ppurC4j7a8LTFnFqZGSjcPj8Xn36KrKv3opVQt3K+6tuOochqn2rr3e0CXLJ2B9iTs/I iN8gT5xByJ1Yh4Hs6VFnvDA4EHyLl1vcsqlIXflMfi/sir4hrh20rN6M9V6flLOOJ6fS NROD8cZc/m7NKJD6mkmltPjVVp4g/9p+p7Mf+O0HEvlCnwsjreRhHHeLF9Tqii4DH0jx A5bTQDQFZZm66RZ+00VqaLkkRajgaDYU+OSiPGOtp6WQZhzR1eC8F/FX5yFZTIjAKy9d Mokg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="jIWF4/z4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id w30-20020a63475e000000b00563d74b6347si4331075pgk.863.2023.09.22.13.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 13:58:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="jIWF4/z4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 0045F8049B6A; Fri, 22 Sep 2023 11:06:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233912AbjIVSGA (ORCPT + 28 others); Fri, 22 Sep 2023 14:06:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233750AbjIVSFf (ORCPT ); Fri, 22 Sep 2023 14:05:35 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A814935BD for ; Fri, 22 Sep 2023 10:54:23 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-68fdd6011f2so2029146b3a.3 for ; Fri, 22 Sep 2023 10:54:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405262; x=1696010062; 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=1ISP2L+rvg6dxZG1wcmYnXloNsZywrTUtixv49IhJ0I=; b=jIWF4/z4UcLuiRz0wCvniJrPmxP3Z9Xk2oBg1jRX5yU4wYwfGGP/1BJZg2TWhJikah 5clKmlgZHGFLNRHpFcSj682t3/0f1EFPjRE1yYxe3GMcAk0BgYOGVSupcP/q3lT7fST8 er+emuk5vVib37xngsMQ973oBiMxxSXfF65B0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405262; x=1696010062; 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=1ISP2L+rvg6dxZG1wcmYnXloNsZywrTUtixv49IhJ0I=; b=w0JdVhTJDnGEzc8yRiKATbaqV0TCGIduenohVjZxz1EYrZhkAFn+ZMmUGvlnt+iX4B cyodc8KFWBMmP03G4ZBRihx9xvPfrrxC06t5dz/6rvfy+4jtsgoeTwnOSoejg1WeOv7z bhKOBZn+ipFPOs8wm93dAlBq482VwvNJHrTxCEm0tpBwWo7soGFfBwcndDhXc/YmUxyo WPqdhiCWjNmj7kH/SSD/dDWEaIcpDjSkCvnfQPe0HBvGIHQhFfhDpORqEdufOUY9nG7a yw3U1k8WsiExg4HP9JpyZ6CuzPc9j5lpvke+Gjit1q3/Wy3EDLUEpnh/Ycs46cUYI1dz kSeA== X-Gm-Message-State: AOJu0YxCxd/kMcxpvQCcB5FGwhpYH0xi+opy1flzE2xod8OVRg+JM3bl y3elYRAawyjHor7dif5KacV0T3Nv4lhShz6nDScMng== X-Received: by 2002:a05:6a20:9499:b0:13b:a2c9:922e with SMTP id hs25-20020a056a20949900b0013ba2c9922emr268710pzb.27.1695405262686; Fri, 22 Sep 2023 10:54: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 c7-20020aa78c07000000b006878cc942f1sm3457800pfd.54.2023.09.22.10.54.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:54:22 -0700 (PDT) From: Kees Cook To: Jorge Lopez Cc: Kees Cook , Hans de Goede , Mark Gross , Nathan Chancellor , Nick Desaulniers , Tom Rix , platform-driver-x86@vger.kernel.org, llvm@lists.linux.dev, =?utf-8?q?Ilpo_J?= =?utf-8?q?=C3=A4rvinen?= , linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH] platform/x86: hp-bioscfg: Annotate struct bios_args with __counted_by Date: Fri, 22 Sep 2023 10:54:21 -0700 Message-Id: <20230922175420.work.701-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1418; i=keescook@chromium.org; h=from:subject:message-id; bh=kt0VlUdlEwKUKwWP1rv6tofv8fjvexz2uhyfkXWj6p8=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdTMfB+LYH5eKEwcBoqoFlTtLOyMMpn1kR2Sa TizrkR/ooiJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3UzAAKCRCJcvTf3G3A JsfnD/wN2QM835WwG5VD399xvmpEfqV/waSzTryLMYZxcqIlyuTG4pL75mWspCtqsPuHkcPq/5+ dS56aaMDY1kiOZILGtGY/o+GWgizQ0X87eI7vpaVFKNq5aVB81SWua/rKAzQ02ogL1ld6i21Bax iKS3RQ4mhGVuAyMeSzgYg6LVxU7VHCAX1MzNuZBEbxxYYc9ePrN+y0Hkr39IRDtkwVWcx2PaZr+ ZPLbM7Gr1c73OWGB0bhxLfHaX1rgfqmB9gXC3lJW/WyMNt2wnbyTplB/202KUySHEVGpzzl7+TK 1cMerBWqiNFK3BmK1tZOZh3L/GUu6t+hXEG1zkNP3sFOGOsRItI8w2yDQEocODb2NVCQZr5t3B+ HELziLz9sxbCa7uWd78WEaYlS+jm4KnMPuXwIOm49XG7eeyCEqDz1zHK07JijFrG3CMQkyWttQ/ J92lXH7PGL8Jnme0WvdP5OUM1swG3A1kKndnO4G2vXJ464QIOn+OsvQC02MTg4EG2OF2cvXaXuz V7+ZvYpLopVQKGVbWWY5H2WfbsVTdPZQHrTdnHLHVkmL6vLAD8wnzqR4fR9rDCWgCGtAzfNnpDD MMUbIToTezIl9ipPdd7j5G99rxqHhdMNHOS6KM1DGgOhQzpxGIl2uXlE55Wb3yx3OZcsI/MIXov dMn7rbm UmQyK2GQ== 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 pete.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 (pete.vger.email [0.0.0.0]); Fri, 22 Sep 2023 11:06:16 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777772838500780340 X-GMAIL-MSGID: 1777772838500780340 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 bios_args. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Jorge Lopez Cc: Hans de Goede Cc: Mark Gross Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: Tom Rix Cc: platform-driver-x86@vger.kernel.org Cc: llvm@lists.linux.dev Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- drivers/platform/x86/hp/hp-bioscfg/biosattr-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/x86/hp/hp-bioscfg/biosattr-interface.c b/drivers/platform/x86/hp/hp-bioscfg/biosattr-interface.c index dea54f35b8b5..4da99cb7218d 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/biosattr-interface.c +++ b/drivers/platform/x86/hp/hp-bioscfg/biosattr-interface.c @@ -19,7 +19,7 @@ struct bios_args { u32 command; u32 commandtype; u32 datasize; - u8 data[]; + u8 data[] __counted_by(datasize); }; /**