From patchwork Fri Sep 22 17:51:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 143762 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:910f:0:b0:403:3b70:6f57 with SMTP id r15csp19737vqg; Fri, 22 Sep 2023 18:17:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPBJ4KexlDumZtmYcbOo2YAq6DBV2BNmjYfqo+4JHE9BOSFY9M8MwFJc/UBlV4VQo1Ee3e X-Received: by 2002:a05:6358:6f86:b0:143:4909:729b with SMTP id s6-20020a0563586f8600b001434909729bmr921534rwn.32.1695431823345; Fri, 22 Sep 2023 18:17:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695431823; cv=none; d=google.com; s=arc-20160816; b=gS2fK14lliMht+XL+VnYd7EnkAwg2Mr9q9PV2rdfsT3yiHWg+ZSmpo/VTyaf7h0Ncw WIo717kV77iRoK4DtrRX7es57NDlkV2thZ0s1VEmZbWT2ynO4/pe7CNqSHVKPQP/ZAD2 y5kFCMJ82KN61qUeutEPAx14oo0SvAhu23nymoCBO2lyk/e8/dEKiUk6hHkykXPmbmij RckFSjVBCUKZ5ki75HaMyx6NBnC3KyuAEZ0GBzx9LYCASw5fQlFSJ/dLb/tMxmAQVjFN TsCh1Mol6Tm8qGxfKTKjDjWRBnlGxKZ9NpCxLP4U8cwA27BfMCdlatjYvPPhj1ikUFE/ Cn3A== 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=rJoQ4rDttwSQzl+h8GPO+G7mapr3BtySN8HDbnxSAIA=; fh=yx73kPbvzDDn3aOkEWOK+d707EvP5RftcQT1i1/lSks=; b=rgejg1DhLzG2KuZn2qHuI8WMYYqOiDp/PHj3QM2jJl+UrI67Y3h3ZDBul0xsCajvBm uV0iNwtKdXTb1KqTLY3Qxsfcn+XnnnWTn8rE6yp6yWF0WUCE1RiGzPzVqVb2iNefoJ1K rV2zH+neqx3GSJiyM1EJvmx8ebiHFLB+oiKLx/+vIaVg82F3wqyzvFYY4R3rI0gJRZnw U0Kx0arcv0s4QivHv5qK51BjXADmtMcy7hZPi41Vg/vkFf6J88Sf+BVFAcvMhynKpEnr Kz3GHyLoXDjcXqohQQz3fmJ8Q/Y4BNTEm3d2uHMC+kNm3SQmFoR8ubgVdJOFOnjDzdQp iz9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=AVnjaPfN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id q2-20020a632a02000000b005777b0c8f59si5059747pgq.478.2023.09.22.18.17.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 18:17:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=AVnjaPfN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id 440DA8379A57; Fri, 22 Sep 2023 10:53:49 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233726AbjIVRxJ (ORCPT + 28 others); Fri, 22 Sep 2023 13:53:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233618AbjIVRwu (ORCPT ); Fri, 22 Sep 2023 13:52:50 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 756D11F1B for ; Fri, 22 Sep 2023 10:51:46 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1c5cd27b1acso21946525ad.2 for ; Fri, 22 Sep 2023 10:51:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1695405103; x=1696009903; 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=rJoQ4rDttwSQzl+h8GPO+G7mapr3BtySN8HDbnxSAIA=; b=AVnjaPfNtxZiQeTDab+hYDn/Q7HWede/UtWdyr9caUwqQ8HcUnDEytBMCF1euy0Qfv hEiW7tOe4CbInHmrzcsf6dqbpgcJRhn4lrj8nTGCT1LgXXvy4BoES2oZDUZ+SCdMr/d2 p0jT0XC6dRP0nMH/SbVJA/qVcd9SbUOMNcGg0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695405103; x=1696009903; 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=rJoQ4rDttwSQzl+h8GPO+G7mapr3BtySN8HDbnxSAIA=; b=m+byDVJqilE3ZJC/Zc4/H8BfbKqX4bcSmHixedAmN2JPJx254rEoIB5MghgK6LvQhF EP7IeEG4ZZfOwnsMJpe87li2IiyzOw5MrU7sr/7nnb+JqT6qF2xhkefqgXfMgD52wRXv J0j0hADhRwlpKrUn4HQE98zX91hP4N4dkByzpDCCWsLuYpbC0cnyUDKm+F7nB6abC0QE ZlRGHfnTHmvPUS3zKGdt3b7vAncxPMKdhOkApEbJvlx1rCWXlpG3EUBn7Krcu3fPOvmT +W9+AhLvWhOPp6/PfCOBlENeNcSxU5CacNQW7SB3syRJaiz8YIFQmBHD0XxfG+GWHgUs oa6g== X-Gm-Message-State: AOJu0YwS7gKO4syTnGUqoqyHwCjEjDA3qjz2iKHZ/u/R6MMRC5sgVbNR qde7em4m6q/fJ3p2ISaH1x5a1Q== X-Received: by 2002:a17:902:f7c7:b0:1c5:dd24:f0bb with SMTP id h7-20020a170902f7c700b001c5dd24f0bbmr158735plw.63.1695405103381; Fri, 22 Sep 2023 10:51:43 -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 ji21-20020a170903325500b001b392bf9192sm3789240plb.145.2023.09.22.10.51.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 10:51:43 -0700 (PDT) From: Kees Cook To: Helge Deller Cc: Kees Cook , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-hardening@vger.kernel.org Subject: [PATCH] video: mmp: Annotate struct mmp_path with __counted_by Date: Fri, 22 Sep 2023 10:51:41 -0700 Message-Id: <20230922175141.work.450-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1140; i=keescook@chromium.org; h=from:subject:message-id; bh=H1/vE1vzDEkKr/pR9G2TlDq8I/0Pjxfcmq4WIBG2rX4=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBlDdQtbAyYSxB3rtoiVITScXMw9/igQbzzli6cd 9NaF66HGJGJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZQ3ULQAKCRCJcvTf3G3A JgFvD/9aVhNFMXOLfYvQuvtNWdczuksf82WmWUjZ3XxnXA2fVtRIrmINsMubWXN5BqlzWb54JAd 2JvpfxjAjclOiZQ1TaC+xCzUTkoEbnWszJAT778l3qNuM+FynSmS8WJqcyfFWae6qACzw/UexAD JDEdStWGpO05F2Y+sgcCmf6rvfJS8A3MiilSGKaXl+xUHsXWS2iEBwRa4eiIE70ykhfR0HAMdXS L5qBSDWbXjlq0mui0yKkhE6H+xAA95ChwfuiVfcSp3s7uA5qT12D1BC9Cxy9TwGWQc/gzstl0q5 Act4VdII0lEJtWXvl4Sj9czaYZOIflGtUky/NbxfaXdyCXBldJ15O3hex7Gy+a7jRwaFIO5lP1l VrXKQwNlknIw7kLZsuScN9wJEkwbAkNtn2dNeXWJRIVDRZlEDYch+nmd1ma+pDKFjLccKHNVCyn srI+NBBV0w6HIUUfyqXhVfXNhpxbawfW88qpoywu/N71xmeTIdAbcNhW4F7jFKwwFPOz8+ib6PB htPR2uKXF1fwz05xPScZwFqkbtuiB5nzGhfpttxqXo6HjJpg3OuRsjckExbw4ipKW2dbuANjPVL n1Saavvp4yFM7FKZDSNxqVP/nSKD8kjtleMkQzEEJwmM4S/b0Fm0MbxtSCIKC/ed6tHkllPeipu NODokxp /mmGU/PQ== 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 morse.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 (morse.vger.email [0.0.0.0]); Fri, 22 Sep 2023 10:53:49 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777789119598962067 X-GMAIL-MSGID: 1777789119598962067 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 mmp_path. [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci Cc: Helge Deller Cc: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Kees Cook Reviewed-by: Gustavo A. R. Silva --- include/video/mmp_disp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/video/mmp_disp.h b/include/video/mmp_disp.h index 77252cb46361..a722dcbf5073 100644 --- a/include/video/mmp_disp.h +++ b/include/video/mmp_disp.h @@ -231,7 +231,7 @@ struct mmp_path { /* layers */ int overlay_num; - struct mmp_overlay overlays[]; + struct mmp_overlay overlays[] __counted_by(overlay_num); }; extern struct mmp_path *mmp_get_path(const char *name);