From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3685415853A; Wed, 20 Nov 2024 12:58:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732107508; cv=none; b=ju59WdmjkFWzEAT34VtcWmspJKiUIQs4C3WuqIzN0+MlIlXOGRDpmcOMTNZgZkm7jIMuF1JQAe7YA2LL31Gdw0lwBNVIIAaKCvyYaHV5WnXAfeeuGmnk27maKcFU3DVbdBbKqBK5eWEK51t2Rcc1VNX3hTuzXkmYPsAc5SL//t4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732107508; c=relaxed/simple; bh=tVLRBDQvw9PPnPDsMojbUcl31L0AO0Dd2F0CwoAkCUc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f/rrv6H885IU7r/s5BzkCZ5VqWbedpZzLrhcZgLtdXgFR52pGHBIVjHqB4SWfvFj42fvEhmVwHhvkmNcKFyssZKv7i6cb9ku5eQQkghCwnTLx6cl0tR2+rTvUR59aZnvTE/fG6eNeJsPvm1na27T63Id4PO409B6GDU1LVzJVQI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EwCPYXcp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="EwCPYXcp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D1E1C4CED2; Wed, 20 Nov 2024 12:58:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1732107508; bh=tVLRBDQvw9PPnPDsMojbUcl31L0AO0Dd2F0CwoAkCUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EwCPYXcpgtkRRp8u2ga7LSlQOwf2fMyLPqUDVruBEUiNlmVQobqzmGk9NjTPNLE56 I6JQ5Tj9sYHXrlXJHdMOVPWIjt+RP2YNVLu8gsDs7wIIYjRJgUcIz7MTb1YoGG4rVJ XZzh0nEpTDDHbBHR4d+kdkIj8uAQ18xsfdts6eDI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andy Yan , Heiko Stuebner , Sasha Levin Subject: [PATCH 6.11 004/107] drm/rockchip: vop: Fix a dereferenced before check warning Date: Wed, 20 Nov 2024 13:55:39 +0100 Message-ID: <20241120125629.779809209@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241120125629.681745345@linuxfoundation.org> References: <20241120125629.681745345@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andy Yan [ Upstream commit ab1c793f457f740ab7108cc0b1340a402dbf484d ] The 'state' can't be NULL, we should check crtc_state. Fix warning: drivers/gpu/drm/rockchip/rockchip_drm_vop.c:1096 vop_plane_atomic_async_check() warn: variable dereferenced before check 'state' (see line 1077) Fixes: 5ddb0bd4ddc3 ("drm/atomic: Pass the full state to planes async atomic check and update") Signed-off-by: Andy Yan Signed-off-by: Heiko Stuebner Link: https://patchwork.freedesktop.org/patch/msgid/20241021072818.61621-1-andyshrk@163.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index f161f40d8ce4c..69900138295bf 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1093,10 +1093,10 @@ static int vop_plane_atomic_async_check(struct drm_plane *plane, if (!plane->state->fb) return -EINVAL; - if (state) - crtc_state = drm_atomic_get_existing_crtc_state(state, - new_plane_state->crtc); - else /* Special case for asynchronous cursor updates. */ + crtc_state = drm_atomic_get_existing_crtc_state(state, new_plane_state->crtc); + + /* Special case for asynchronous cursor updates. */ + if (!crtc_state) crtc_state = plane->crtc->state; return drm_atomic_helper_check_plane_state(plane->state, crtc_state, -- 2.43.0