Skip to contentSkip to conversation

soc: fsl: qbman: Remove const from portal->cgrs allocation type

PATCH Applied Kees Cook 2 participants 2 messages Apr 26, 2025 – May 17, 2025 Freescale SoC drivers

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 soc: fsl: qbman: Remove const from portal->cgrs 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 assigned type is "struct qman_cgrs *", but the returned type, while technically matching, is const qualified. As there is no general way to remove const qualifiers, adjust the allocation type to match the assignment.

---
Cc: Christophe Leroy <[email protected]>
Cc: Sean Anderson <[email protected]>
Cc: Camelia Groza <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Vladimir Oltean <[email protected]>
Cc: "Dr. David Alan Gilbert" <[email protected]>
Cc: <[email protected]>
Cc: <[email protected]>

---
 drivers/soc/fsl/qbman/qman.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/fsl/qbman/qman.c +1 -1
index 4dc8aba33d9b..9be240999f87 100644
@@ -1270,7 +1270,7 @@ static int qman_create_portal(struct qman_portal *portal,
 	qm_dqrr_set_ithresh(p, QMAN_PIRQ_DQRR_ITHRESH);
 	qm_mr_set_ithresh(p, QMAN_PIRQ_MR_ITHRESH);
 	qm_out(p, QM_REG_ITPR, QMAN_PIRQ_IPERIOD);
-	portal->cgrs = kmalloc_array(2, sizeof(*cgrs), GFP_KERNEL);
+	portal->cgrs = kmalloc_array(2, sizeof(*portal->cgrs), GFP_KERNEL);
 	if (!portal->cgrs)
 		goto fail_cgrs;
 	/* initial snapshot is no-depletion */
Signature · 1 line
2.34.1
#1 lore raw
Quoted 11 lines · Kees Cook

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 assigned type is "struct qman_cgrs *", but the returned type, while technically matching, is const qualified. As there is no general way to remove const qualifiers, adjust the allocation type to match the assignment.

[...]

Applied, thanks!

[1/1] soc: fsl: qbman: Remove const from portal->cgrs allocation type

      commit: 5ddac92be4209f29ec26b3ec59a08fc76afe9ab1

Best regards,

Signature · 1 line
Christophe Leroy <[email protected]>