]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
soc: fsl: qbman: Remove const from portal->cgrs allocation type
authorKees Cook <kees@kernel.org>
Sat, 26 Apr 2025 06:20:41 +0000 (23:20 -0700)
committerChristophe Leroy <christophe.leroy@csgroup.eu>
Mon, 12 May 2025 23:38:56 +0000 (01:38 +0200)
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>
Link: https://lore.kernel.org/r/20250426062040.work.047-kees@kernel.org
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
drivers/soc/fsl/qbman/qman.c

index 4dc8aba33d9b70cbdaab6369370da0ccf484a7b1..9be240999f8774bcdb44ec542a222b0441b3b95b 100644 (file)
@@ -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 */