Skip to contentSkip to conversation

comedi: Adjust range_table_list allocation type

PATCH New Kees Cook 1 participant 1 message Apr 26, 2025 Comedi drivers

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 comedi: Adjust range_table_list allocation type

In preparation for making the kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.)

The returned type is "struct comedi_lrange **", but the assigned type, while technically matching, is const qualified. Since there is no general way to remove const qualifiers, switch the returned type to match the assign type. No change in allocation size results.

---
Cc: Ian Abbott <[email protected]>
Cc: H Hartley Sweeten <[email protected]>

---
 drivers/comedi/drivers/ni_670x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/comedi/drivers/ni_670x.c +1 -1
index c875d251c230..563a9c790f12 100644
@@ -199,7 +199,7 @@ static int ni_670x_auto_attach(struct comedi_device *dev,
 		const struct comedi_lrange **range_table_list;
 
 		range_table_list = kmalloc_array(32,
-						 sizeof(struct comedi_lrange *),
+						 sizeof(*range_table_list),
 						 GFP_KERNEL);
 		if (!range_table_list)
 			return -ENOMEM;
Signature · 1 line
2.34.1