]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/vkms: Adjust vkms_state->active_planes allocation type
authorKees Cook <kees@kernel.org>
Sat, 26 Apr 2025 06:14:32 +0000 (23:14 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:04:02 +0000 (11:04 +0100)
[ Upstream commit 258aebf100540d36aba910f545d4d5ddf4ecaf0b ]

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 vkms_plane_state **", but the returned type
will be "struct drm_plane **". These are the same size (pointer size), but
the types don't match. Adjust the allocation type to match the assignment.

Signed-off-by: Kees Cook <kees@kernel.org>
Reviewed-by: Louis Chauvet <louis.chauvet@bootlin.com>
Fixes: 8b1865873651 ("drm/vkms: totally reworked crc data tracking")
Link: https://lore.kernel.org/r/20250426061431.work.304-kees@kernel.org
Signed-off-by: Louis Chauvet <contact@louischauvet.fr>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/vkms/vkms_crtc.c

index 1ae5cd47d95467a908ac080cd9064c48bddf67b4..2225e764e709f50949470a462d64756fcbd84cf9 100644 (file)
@@ -194,7 +194,7 @@ static int vkms_crtc_atomic_check(struct drm_crtc *crtc,
                i++;
        }
 
-       vkms_state->active_planes = kcalloc(i, sizeof(plane), GFP_KERNEL);
+       vkms_state->active_planes = kcalloc(i, sizeof(*vkms_state->active_planes), GFP_KERNEL);
        if (!vkms_state->active_planes)
                return -ENOMEM;
        vkms_state->num_active_planes = i;