]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ptp: ocp: Add const to bp->attr_group allocation type
authorKees Cook <kees@kernel.org>
Sat, 26 Apr 2025 06:18:59 +0000 (23:18 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 29 Apr 2025 18:00:45 +0000 (11:00 -0700)
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 "const struct attribute_group **", but the returned
type, while technically matching, will be not const qualified. As there is
no general way to safely add const qualifiers, adjust the allocation type
to match the assignment.

Signed-off-by: Kees Cook <kees@kernel.org>
Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
Link: https://patch.msgid.link/20250426061858.work.470-kees@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/ptp/ptp_ocp.c

index faf6e027f89ab4a5a9c03eac062d1f97711f770b..ed5968a3ea5a5e9c5148105fd4ca2f50427f3214 100644 (file)
@@ -2372,7 +2372,7 @@ ptp_ocp_attr_group_add(struct ptp_ocp *bp,
                if (attr_tbl[i].cap & bp->fw_cap)
                        count++;
 
-       bp->attr_group = kcalloc(count + 1, sizeof(struct attribute_group *),
+       bp->attr_group = kcalloc(count + 1, sizeof(*bp->attr_group),
                                 GFP_KERNEL);
        if (!bp->attr_group)
                return -ENOMEM;