Commit 06190e1c authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Kees Cook
Browse files

drm/nouveau: fifo: Avoid -Wflex-array-member-not-at-end warning 



-Wflex-array-member-not-at-end was introduced in GCC-14, and we are
getting ready to enable it, globally.

Use the new TRAILING_OVERLAP() helper to fix the following warning:

drivers/gpu/drm/nouveau/nvif/fifo.c:29:42: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]

This helper creates a union between a flexible-array member (FAM)
and a set of members that would otherwise follow it. This overlays
the trailing members onto the FAM while preserving the original
memory layout.

Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: default avatarJustin Stitt <justinstitt@google.com>
Acked-by: default avatarDanilo Krummrich <dakr@kernel.org>
Link: https://patch.msgid.link/aJ17oxJYcqqr3946@kspp


Signed-off-by: default avatarKees Cook <kees@kernel.org>
parent 9448598b

drivers/gpu/drm/nouveau/nvif/fifo.c

+2 −3
Original line number Diff line number Diff line
@@ -25,13 +25,12 @@ static int 
nvif_fifo_runlists(struct nvif_device *device)

{

	struct nvif_object *object = &device->object;

	struct {

		struct nv_device_info_v1 m;

	TRAILING_OVERLAP(struct nv_device_info_v1, m, data,

		struct {

			struct nv_device_info_v1_data runlists;

			struct nv_device_info_v1_data runlist[64];

		} v;

	} *a;

	) *a;

	int ret, i;



	if (device->runlist)