Skip to contentSkip to conversation

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

PATCH Superseded Gustavo A. R. Silva 2 participants 2 messages Apr 4, 2025 – Apr 7, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

Adjust heap allocation to account for the flex-array-in-the-middle issue, and refactor the rest of the code accordingly.

So, with these changes, 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]

---
Changes in v2:
- Adjust heap allocation instead of using the DEFINE_RAW_FLEX() helper.
- Link: https://lore.kernel.org/lkml/[email protected]/

v1:
- Link: https://lore.kernel.org/linux-hardening/Z-7IQcWNePAMQEM0@kspp/

 drivers/gpu/drm/nouveau/nvif/fifo.c | 35 +++++++++++++++--------------
 1 file changed, 18 insertions(+), 17 deletions(-)
drivers/gpu/drm/nouveau/nvif/fifo.c +18 -17
index a463289962b2..2c887dffa45d 100644
@@ -25,33 +25,34 @@ static int
 nvif_fifo_runlists(struct nvif_device *device)
 {
 	struct nvif_object *object = &device->object;
-	struct {
-		struct nv_device_info_v1 m;
-		struct {
-			struct nv_device_info_v1_data runlists;
-			struct nv_device_info_v1_data runlist[64];
-		} v;
-	} *a;
+	struct nv_device_info_v1_data *runlists;
+	struct nv_device_info_v1_data *runlist;
+	struct nv_device_info_v1 *a;
+	const u8 runlist_cnt = 64;
 	int ret, i;
 
 	if (device->runlist)
 		return 0;
 
-	if (!(a = kmalloc(sizeof(*a), GFP_KERNEL)))
+	a = kmalloc(struct_size(a, data, runlist_cnt + 1), GFP_KERNEL);
+	if (!a)
 		return -ENOMEM;
-	a->m.version = 1;
-	a->m.count = sizeof(a->v) / sizeof(a->v.runlists);
-	a->v.runlists.mthd = NV_DEVICE_HOST_RUNLISTS;
-	for (i = 0; i < ARRAY_SIZE(a->v.runlist); i++) {
-		a->v.runlist[i].mthd = NV_DEVICE_HOST_RUNLIST_ENGINES;
-		a->v.runlist[i].data = i;
+
+	runlists = &a->data[0];
+	runlist = &a->data[1];
+	a->version = 1;
+	a->count = runlist_cnt + 1;
+	runlists->mthd = NV_DEVICE_HOST_RUNLISTS;
+	for (i = 0; i < runlist_cnt; i++) {
+		runlist[i].mthd = NV_DEVICE_HOST_RUNLIST_ENGINES;
+		runlist[i].data = i;
 	}
 
 	ret = nvif_object_mthd(object, NV_DEVICE_V0_INFO, a, sizeof(*a));
 	if (ret)
 		goto done;
 
-	device->runlists = fls64(a->v.runlists.data);
+	device->runlists = fls64(runlists->data);
 	device->runlist = kcalloc(device->runlists, sizeof(*device->runlist),
 				  GFP_KERNEL);
 	if (!device->runlist) {
@@ -60,8 +61,8 @@ nvif_fifo_runlists(struct nvif_device *device)
 	}
 
 	for (i = 0; i < device->runlists; i++) {
-		if (a->v.runlist[i].mthd != NV_DEVICE_INFO_INVALID)
-			device->runlist[i].engines = a->v.runlist[i].data;
+		if (runlist[i].mthd != NV_DEVICE_INFO_INVALID)
+			device->runlist[i].engines = runlist[i].data;
 	}
 
 done:
Signature · 1 line
2.43.0
#1 lore raw
Quoted 38 lines · Gustavo A. R. Silva

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

Adjust heap allocation to account for the flex-array-in-the-middle issue, and refactor the rest of the code accordingly.

So, with these changes, 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]

---
Changes in v2:
- Adjust heap allocation instead of using the DEFINE_RAW_FLEX() helper.
- Link: https://lore.kernel.org/lkml/[email protected]/

v1:
- Link: https://lore.kernel.org/linux-hardening/Z-7IQcWNePAMQEM0@kspp/

 drivers/gpu/drm/nouveau/nvif/fifo.c | 35 +++++++++++++++--------------
 1 file changed, 18 insertions(+), 17 deletions(-)
drivers/gpu/drm/nouveau/nvif/fifo.c +1 -7
index a463289962b2..2c887dffa45d 100644
@@ -25,33 +25,34 @@ static int
 nvif_fifo_runlists(struct nvif_device *device)
 {
 	struct nvif_object *object = &device->object;
-	struct {
-		struct nv_device_info_v1 m;
-		struct {
-			struct nv_device_info_v1_data runlists;
-			struct nv_device_info_v1_data runlist[64];
-		} v;
-	} *a;
+	struct nv_device_info_v1_data *runlists;

drivers/gpu/drm/nouveau/nvif/fifo.c static int · line 37

Quoted 10 lines
drivers/gpu/drm/nouveau/nvif/fifo.c +4 -1
+	struct nv_device_info_v1_data *runlist;
+	struct nv_device_info_v1 *a;
+	const u8 runlist_cnt = 64;
 	int ret, i;
 
 	if (device->runlist)
 		return 0;
 
-	if (!(a = kmalloc(sizeof(*a), GFP_KERNEL)))
+	a = kmalloc(struct_size(a, data, runlist_cnt + 1), GFP_KERNEL);

Hrm, a pre-existing issue, but this is dumping quite a few uninitialized bytes into this allocation, as struct nv_device_info_v1::pad is never initialized and runlists->data is never initialized. It looks like these bytes are being written out to the video card? Or some kind of ioctl?

This should really be using kzalloc() or making sure stuff isn't uninitialized.

drivers/gpu/drm/nouveau/nvif/fifo.c static int · line 44

Quoted 13 lines
drivers/gpu/drm/nouveau/nvif/fifo.c +6 -6
+	if (!a)
 		return -ENOMEM;
-	a->m.version = 1;
-	a->m.count = sizeof(a->v) / sizeof(a->v.runlists);
-	a->v.runlists.mthd = NV_DEVICE_HOST_RUNLISTS;
-	for (i = 0; i < ARRAY_SIZE(a->v.runlist); i++) {
-		a->v.runlist[i].mthd = NV_DEVICE_HOST_RUNLIST_ENGINES;
-		a->v.runlist[i].data = i;
+
+	runlists = &a->data[0];
+	runlist = &a->data[1];
+	a->version = 1;
+	a->count = runlist_cnt + 1;

Seems struct nv_device_info_v1::count is the counted_by for struct nv_device_info_v1::data?

drivers/gpu/drm/nouveau/nvif/fifo.c static int · line 55

Quoted 12 lines
drivers/gpu/drm/nouveau/nvif/fifo.c +5 -1
+	runlists->mthd = NV_DEVICE_HOST_RUNLISTS;
+	for (i = 0; i < runlist_cnt; i++) {
+		runlist[i].mthd = NV_DEVICE_HOST_RUNLIST_ENGINES;
+		runlist[i].data = i;
 	}
 
 	ret = nvif_object_mthd(object, NV_DEVICE_V0_INFO, a, sizeof(*a));
 	if (ret)
 		goto done;
 
-	device->runlists = fls64(a->v.runlists.data);
+	device->runlists = fls64(runlists->data);

I assume nvif_object_mthd() writes runlists->data?

Quoted 17 lines
drivers/gpu/drm/nouveau/nvif/fifo.c +2 -2
 	device->runlist = kcalloc(device->runlists, sizeof(*device->runlist),
 				  GFP_KERNEL);
 	if (!device->runlist) {
@@ -60,8 +61,8 @@ nvif_fifo_runlists(struct nvif_device *device)
 	}
 
 	for (i = 0; i < device->runlists; i++) {
-		if (a->v.runlist[i].mthd != NV_DEVICE_INFO_INVALID)
-			device->runlist[i].engines = a->v.runlist[i].data;
+		if (runlist[i].mthd != NV_DEVICE_INFO_INVALID)
+			device->runlist[i].engines = runlist[i].data;
 	}
 
 done:
Signature · 1 line
2.43.0
Signature · 1 line
Kees Cook