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 89B4D1B29C1; Wed, 25 Sep 2024 12:05:41 +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=1727265941; cv=none; b=ayPbBXS7IEUYGJgHBh263hvrt3n5X4ZGx0DDG8Gl7xfWGpPpXSJLrJ3/pCZqWRtIx0TpTJjMpa8Zs15z8vgOaKD8BpETaWxAYs51ClPrLQXmvhrRw8LeJ9XEXTIQyA3p24DoD/A2YdBJYPB/0hO16ox5FmLRssbSZzfwNuFIFEI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727265941; c=relaxed/simple; bh=buF0BTFa1FX38D2IPofvB++yA0tCtGFJhd41cIarJgw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nUaqw3WPY99GOpD0iEyydB6h+o2Eho+i5obnwDGhWP7YOX/KP1EIu9/NmsejDRIiNKg7BTCE/uUJjsrAQRD30A96cdhLI2Q7W7hyxpgpbwLgc23t23NBjloPs9WREuCqoVlA8ujqImIn4zA8lCKRb5GXOdej+uiM2jYbG2/u87A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FMydNKIL; 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="FMydNKIL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6671C4CEC3; Wed, 25 Sep 2024 12:05:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727265941; bh=buF0BTFa1FX38D2IPofvB++yA0tCtGFJhd41cIarJgw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FMydNKILxZlwSrooQeWkb4w007foZf3y4saH5daN0NdJGA8p7lj88f6Fr7I0l2Lsk Uu+xJt8WDSAcyVAwwyaM0DnYK11ZpclTG3B5kenPuLMjt0rW4pu/ANV2smz4hdGY+M +xuMFVgF2MWjcbtuZu5ANGOStFsgWi1Fvt8TFjd5YnrE3zi1+lQ/dXVQ2tTlk/O+Y0 XOMj5TiWG2rno4MAXTImEiTpV9O5OVfPXKLGB2nXLwbiKCOuMfxfvM243O7doKlG7B DO+qDCokp2GI107sSvLgw7iXFj8kCpcc0AkHY5UjAqvdJC0219Frx200CJ3jwVPwbB R0XmV35clGlYQ== 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, alvin.lee2@amd.com, wenjing.liu@amd.com, george.shen@amd.com, dillon.varone@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.10 129/197] drm/amd/display: Add NULL check for function pointer in dcn20_set_output_transfer_func Date: Wed, 25 Sep 2024 07:52:28 -0400 Message-ID: <20240925115823.1303019-129-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240925115823.1303019-1-sashal@kernel.org> References: <20240925115823.1303019-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.10.11 Content-Transfer-Encoding: 8bit From: Srinivasan Shanmugam [ Upstream commit 62ed6f0f198da04e884062264df308277628004f ] This commit adds a null check for the set_output_gamma function pointer in the dcn20_set_output_transfer_func function. Previously, set_output_gamma was being checked for null at line 1030, but then it was being dereferenced without any null check at line 1048. This could potentially lead to a null pointer dereference error 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 at line 1048. 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/dcn20/dcn20_hwseq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c index 7d833fa6dd77c..58e8b7482f4f5 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c @@ -1040,7 +1040,8 @@ bool dcn20_set_output_transfer_func(struct dc *dc, struct pipe_ctx *pipe_ctx, /* * if above if is not executed then 'params' equal to 0 and set in bypass */ - 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 true; } -- 2.43.0