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

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

[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.

Signed-off-by: Kees Cook <kees@kernel.org>
---
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Sean Anderson <sean.anderson@linux.dev>
Cc: Camelia Groza <camelia.groza@nxp.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Vladimir Oltean <vladimir.oltean@nxp.com>
Cc: "Dr. David Alan Gilbert" <linux@treblig.org>
Cc: <linuxppc-dev@lists.ozlabs.org>
Cc: <linux-arm-kernel@lists.infradead.org>
---
 drivers/soc/fsl/qbman/qman.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c
index 4dc8aba33d9b..9be240999f87 100644
--- a/drivers/soc/fsl/qbman/qman.c
+++ b/drivers/soc/fsl/qbman/qman.c
@@ -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 */
-- 
2.34.1

Re: [PATCH] soc: fsl: qbman: Remove const from portal->cgrs allocation type

[Christophe Leroy]

On Fri, 25 Apr 2025 23:20:41 -0700, Kees Cook wrote:
> 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,
-- 
Christophe Leroy <christophe.leroy@csgroup.eu>