From nobody Tue Dec 30 09:48:21 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1893C197A0 for ; Thu, 16 Nov 2023 18:11:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229495AbjKPSLw (ORCPT ); Thu, 16 Nov 2023 13:11:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229464AbjKPSLu (ORCPT ); Thu, 16 Nov 2023 13:11:50 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3B79195 for ; Thu, 16 Nov 2023 10:11:47 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E2C7C433C9; Thu, 16 Nov 2023 18:11:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700158307; bh=Ry4mQQ1q/vn/j3+Dj1Ms0K/kq2DMCGX9s61dOISwTRo=; h=Date:From:To:Cc:Subject:From; b=la6R0gS4A9sua9wheZyCxfbRGCUfMXibabY/Ch7ODIveMD52xRHRGABVg9QniPV3L /5Z5+C+0ck49xRi+27ggYHvoNZ3Oq4AxSk6SqMgLOYo+Q56/tu7/awDVwGKwQU3SG3 VEgi/EuHhu7B8nSgTEx7dl4Q7xjz2zJL6LLENK82zgRCCPA5RZYClmRkDBA7TsP1+5 8LkS2PdipAWqokVc9o8iBKQ3B0Z0al6fKdNvMtOHlA3MylPEzhnCFMQhedTPgQd9Bs ka46ygRkuiJqgbpkdHucUNQ2Vj94TTjKwtYlHTz8Wu4/J3Wm9yRZztnQU8cgsHZ9CS Jcg/Mtvj3mylA== Date: Thu, 16 Nov 2023 12:11:43 -0600 From: "Gustavo A. R. Silva" To: Karol Herbst , Lyude Paul , Danilo Krummrich , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org Subject: [PATCH][next] nouveau/gsp: replace zero-length array with flex-array member and use __counted_by Message-ID: MIME-Version: 1.0 Content-Disposition: inline Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fake flexible arrays (zero-length and one-element arrays) are deprecated, and should be replaced by flexible-array members. So, replace zero-length array with a flexible-array member in `struct PACKED_REGISTRY_TABLE`. Also annotate array `entries` with `__counted_by()` to 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 via `CONFIG_UBSAN_BOUNDS` (for array indexing) and `CONFIG_FORTIFY_SOURCE` (for strcpy/memcpy-family functions). This fixes multiple -Warray-bounds warnings: drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c:1069:29: warning: array subs= cript 0 is outside array bounds of 'PACKED_REGISTRY_ENTRY[0]' [-Warray-boun= ds=3D] drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c:1070:29: warning: array subs= cript 0 is outside array bounds of 'PACKED_REGISTRY_ENTRY[0]' [-Warray-boun= ds=3D] drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c:1071:29: warning: array subs= cript 0 is outside array bounds of 'PACKED_REGISTRY_ENTRY[0]' [-Warray-boun= ds=3D] drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c:1072:29: warning: array subs= cript 0 is outside array bounds of 'PACKED_REGISTRY_ENTRY[0]' [-Warray-boun= ds=3D] While there, also make use of the struct_size() helper, and address checkpatch.pl warning: WARNING: please, no spaces at the start of a line This results in no differences in binary output. Signed-off-by: Gustavo A. R. Silva Reviewed-by: Kees Cook --- .../nvrm/535.113.01/nvidia/generated/g_os_nvoc.h | 14 +++++++------- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generat= ed/g_os_nvoc.h b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/gen= erated/g_os_nvoc.h index 754c6af42f30..259b25c2ac6b 100644 --- a/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_os= _nvoc.h +++ b/drivers/gpu/drm/nouveau/include/nvrm/535.113.01/nvidia/generated/g_os= _nvoc.h @@ -28,17 +28,17 @@ =20 typedef struct PACKED_REGISTRY_ENTRY { - NvU32 nameOffset; - NvU8 type; - NvU32 data; - NvU32 length; + NvU32 nameOffset; + NvU8 type; + NvU32 data; + NvU32 length; } PACKED_REGISTRY_ENTRY; =20 typedef struct PACKED_REGISTRY_TABLE { - NvU32 size; - NvU32 numEntries; - PACKED_REGISTRY_ENTRY entries[0]; + NvU32 size; + NvU32 numEntries; + PACKED_REGISTRY_ENTRY entries[] __counted_by(numEntries); } PACKED_REGISTRY_TABLE; =20 #endif diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c b/drivers/gpu/d= rm/nouveau/nvkm/subdev/gsp/r535.c index dc44f5c7833f..228335487af5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c @@ -1048,7 +1048,7 @@ r535_gsp_rpc_set_registry(struct nvkm_gsp *gsp) char *strings; int str_offset; int i; - size_t rpc_size =3D sizeof(*rpc) + sizeof(rpc->entries[0]) * NV_GSP_REG_N= UM_ENTRIES; + size_t rpc_size =3D struct_size(rpc, entries, NV_GSP_REG_NUM_ENTRIES); =20 /* add strings + null terminator */ for (i =3D 0; i < NV_GSP_REG_NUM_ENTRIES; i++) --=20 2.34.1