From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6854EC369CB for ; Sat, 26 Apr 2025 06:14:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D783C10E1FC; Sat, 26 Apr 2025 06:14:41 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="nrsqxMkQ"; dkim-atps=neutral Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id AD78E10E1FC for ; Sat, 26 Apr 2025 06:14:40 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id A999749B84; Sat, 26 Apr 2025 06:14:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4AAB9C4CEE2; Sat, 26 Apr 2025 06:14:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745648076; bh=2S6FazreNdjnfIYoLguCqFO9oh1E5RA+zvoSpthv3PA=; h=From:To:Cc:Subject:Date:From; b=nrsqxMkQLI8iHlTgxJHpUFqF41aD6CByanLOmURxG4Sr+qv7Zo1QEiHZFBJ6BNsEs yrN2NKnVJsipUJQTDYCXLMpDQfg5z5G+LknEnno/Dvtde19fQun8pK6LtaU74EerYM JV3a2+gFE5weDPL9t3nVvoR1Daxg/5RRodYvScqjaM8/w0QZi7buE+RBuq0Jdp6zBo VDx+d3t9Cge+DBP8A5FJdBqbKgWpc8zNiHbJLzpcrNjdWG4Dl3b+EeXGJqMwwtppgo oUgLB00eotL4RZllkuWEe3rho4rCHKQF18NWqOUtzZgbjB+qfdonyxwktbJiufbi/3 Uc2piYQsKxiPw== From: Kees Cook To: Louis Chauvet Cc: Kees Cook , Haneen Mohammed , Simona Vetter , Melissa Wen , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH] drm/vkms: Adjust vkms_state->active_planes allocation type Date: Fri, 25 Apr 2025 23:14:32 -0700 Message-Id: <20250426061431.work.304-kees@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1626; i=kees@kernel.org; h=from:subject:message-id; bh=2S6FazreNdjnfIYoLguCqFO9oh1E5RA+zvoSpthv3PA=; b=owGbwMvMwCVmps19z/KJym7G02pJDBk8lSfu6W4MtPbYf3hzwpalax4WLg559Ob6Wpb5E4rSV it9ik8u6yhlYRDjYpAVU2QJsnOPc/F42x7uPlcRZg4rE8gQBi5OAZjICxdGhvUb248ZT+JffLlV tVL/wudGWdXjX6eG8WRGs9qYxhYuZ2P4H5rlLi716ODxDhuv0LKL6nlh8sIdb3Z15xwtVuxSnSH FAgA= X-Developer-Key: i=kees@kernel.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 --- Cc: Louis Chauvet Cc: Haneen Mohammed Cc: Simona Vetter Cc: Melissa Wen Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann Cc: David Airlie Cc: --- drivers/gpu/drm/vkms/vkms_crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c index 12034ec12029..8c9898b9055d 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -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; -- 2.34.1