Skip to contentSkip to conversation

ubd: Use pointer-to-pointers for io_thread_req arrays

PATCH In review Kees Cook 2 participants 2 messages Feb 23 User-mode Linux (UML)

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 ubd: Use pointer-to-pointers for io_thread_req arrays

Having an unbounded array for irq_req_buffer and io_req_buffer doesn't provide any bounds safety, and confuses the needed allocation type, which is returning a pointer to pointers. Instead of the implicit cast, switch the variable types.

Fixes 69050f8d6d07 ("treewide: Replace kmalloc with kmalloc_obj for non-scalar types")

---
Cc: Richard Weinberger <[email protected]>
Cc: Anton Ivanov <[email protected]>
Cc: Johannes Berg <[email protected]>
Cc: Jens Axboe <[email protected]>
Cc: Hannes Reinecke <[email protected]>
Cc: "Martin K. Petersen" <[email protected]>
Cc: Tiwei Bie <[email protected]>
Cc: <[email protected]>

---
 arch/um/drivers/ubd_kern.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/um/drivers/ubd_kern.c +5 -5
index 012b2bcaa8a0..20fc33300a95 100644
@@ -69,11 +69,11 @@ struct io_thread_req {
 };
 
 
-static struct io_thread_req * (*irq_req_buffer)[];
+static struct io_thread_req **irq_req_buffer;
 static struct io_thread_req *irq_remainder;
 static int irq_remainder_size;
 
-static struct io_thread_req * (*io_req_buffer)[];
+static struct io_thread_req **io_req_buffer;
 static struct io_thread_req *io_remainder;
 static int io_remainder_size;
 
@@ -398,7 +398,7 @@ static int thread_fd = -1;
 
 static int bulk_req_safe_read(
 	int fd,
-	struct io_thread_req * (*request_buffer)[],
+	struct io_thread_req **request_buffer,
 	struct io_thread_req **remainder,
 	int *remainder_size,
 	int max_recs
@@ -465,7 +465,7 @@ static irqreturn_t ubd_intr(int irq, void *dev)
 			&irq_remainder, &irq_remainder_size,
 			UBD_REQ_BUFFER_SIZE)) >= 0) {
 		for (i = 0; i < len / sizeof(struct io_thread_req *); i++)
-			ubd_end_request((*irq_req_buffer)[i]);
+			ubd_end_request(irq_req_buffer[i]);
 	}
 
 	if (len < 0 && len != -EAGAIN)
@@ -1512,7 +1512,7 @@ void *io_thread(void *arg)
 		}
 
 		for (count = 0; count < n/sizeof(struct io_thread_req *); count++) {
-			struct io_thread_req *req = (*io_req_buffer)[count];
+			struct io_thread_req *req = io_req_buffer[count];
 			int i;
 
 			io_count++;
Signature · 1 line
2.34.1
maintainer Acked-by on v1 1/1
#1 lore raw

----- Ursprüngliche Mail -----

Quoted 33 lines

Von: "Kees Cook" <[email protected]>
An: "richard" <[email protected]>
CC: "Kees Cook" <[email protected]>, "Nathan Chancellor" <[email protected]>, "Guenter Roeck" <[email protected]>, "anton ivanov" <[email protected]>, "Johannes Berg" <[email protected]>, "Jens Axboe" <[email protected]>, "Hannes Reinecke" <[email protected]>, "Martin K. Petersen" <[email protected]>, "Tiwei Bie" <[email protected]>, "linux-um" <[email protected]>, "Al Viro" <[email protected]>, "linux-kernel" <[email protected]>, "linux-hardening" <[email protected]>
Gesendet: Montag, 23. Februar 2026 22:43:45
Betreff: [PATCH] ubd: Use pointer-to-pointers for io_thread_req arrays

Having an unbounded array for irq_req_buffer and io_req_buffer doesn't provide any bounds safety, and confuses the needed allocation type, which is returning a pointer to pointers. Instead of the implicit cast, switch the variable types.

Closes:
https://lore.kernel.org/all/[email protected]

Fixes 69050f8d6d07 ("treewide: Replace kmalloc with kmalloc_obj for non-scalar

types")

---
Cc: Richard Weinberger <[email protected]>
Cc: Anton Ivanov <[email protected]>
Cc: Johannes Berg <[email protected]>
Cc: Jens Axboe <[email protected]>
Cc: Hannes Reinecke <[email protected]>
Cc: "Martin K. Petersen" <[email protected]>
Cc: Tiwei Bie <[email protected]>
Cc: <[email protected]>
---
arch/um/drivers/ubd_kern.c | 10 +++++-----

Quoted 1 line
1 file changed, 5 insertions(+), 5 deletions(-)

Thanks,
//richard