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 B78AA189F3C; Wed, 25 Sep 2024 11:46:40 +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=1727264800; cv=none; b=p9ojjax5EwIVZWlEgw3OJdj4v4UVRKfK1q07QsRY1/g5f226Nm8uLXYvbH5et9H+HwyKaUFrrlXDiVTNbdIJEalkYZ6C0fj17juSi9CHa0vc/khU+n2QMJN6HRAaLwJ/M62vo7Sf8uuMHKHNWpJfUxZd3KHUtiYJqXb/h2zrStw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727264800; c=relaxed/simple; bh=htlTeJszNSBr+txgmM6ukJitel0z8NzZi/OUCseFMHc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kGCQRUtjPI5zRKCGE2N9+JtrhzVjgvH0tmLgThPIJZqABAAGDgaObVIyHqytJcfeKT4uUyci9yykl4VLpnH7QrnmBSzNr6CtYaumHRn2l0vXtr4TJAdgP4vtWW5uQS+yZikOliKM8y4clvP043H/0ok9HQJ1Fbb+qBnSbcwdrjo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qUnlj7LE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qUnlj7LE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FBA9C4CEC3; Wed, 25 Sep 2024 11:46:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727264800; bh=htlTeJszNSBr+txgmM6ukJitel0z8NzZi/OUCseFMHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qUnlj7LE84VP8tm2LCtTzKNOa68Es1j5wvZ42EnZIlNtFsSh9PnEWu7WDXkrkIJNY 81VHFQv2a+wcSGMuh3xn+x99D4hP26Askmd6PT14H69Rvk6E2opVT+QrY3ItkDD1ig dotCo6zR43TaEAeo4Msy6lcvdSyFlKKNgzMZkbFG1u2AQY7Zo073zokqTOZIELBUBC QUi8t6T/yOLpoCHWOle6OoiiVr8F5DaQtu8YTnJiFb7n7MyJKM2PVmioi55ydTqZFC rPQ5JZ5CF70wBu/BueqbcG3Afpl8xuN2c2m/+1b5dp+CCX5ieg0hIJ0T7IaeetfiMd 2AI+2LsZ5Q4Vg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Srinivasan Shanmugam , Tom Chung , Rodrigo Siqueira , Roman Li , Alex Hung , Aurabindo Pillai , Harry Wentland , Hamza Mahfooz , Alex Deucher , Sasha Levin , sunpeng.li@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, sarvinde@amd.com, wenjing.liu@amd.com, nevenko.stupar@amd.com, alvin.lee2@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.11 153/244] drm/amd/display: Add NULL check for function pointer in dcn401_set_output_transfer_func Date: Wed, 25 Sep 2024 07:26:14 -0400 Message-ID: <20240925113641.1297102-153-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925113641.1297102-1-sashal@kernel.org> References: <20240925113641.1297102-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.11 Content-Transfer-Encoding: 8bit From: Srinivasan Shanmugam [ Upstream commit dd340acd42c24a3f28dd22fae6bf38662334264c ] This commit adds a null check for the set_output_gamma function pointer in the dcn401_set_output_transfer_func function. Previously, set_output_gamma was being checked for null, but then it was being dereferenced without any null check. This could lead to a null pointer dereference if set_output_gamma is null. To fix this, we now ensure that set_output_gamma is not null before dereferencing it. We do this by adding a null check for set_output_gamma before the call to set_output_gamma. Cc: Tom Chung Cc: Rodrigo Siqueira Cc: Roman Li Cc: Alex Hung Cc: Aurabindo Pillai Cc: Harry Wentland Cc: Hamza Mahfooz Signed-off-by: Srinivasan Shanmugam Reviewed-by: Tom Chung Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c index 537a24ec74c85..7c724cf682840 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c @@ -748,7 +748,9 @@ bool dcn401_set_output_transfer_func(struct dc *dc, } } - mpc->funcs->set_output_gamma(mpc, mpcc_id, params); + if (mpc->funcs->set_output_gamma) + mpc->funcs->set_output_gamma(mpc, mpcc_id, params); + return ret; } -- 2.43.0