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 2F96822C676; Sun, 24 Mar 2024 23:16:20 +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=1711322181; cv=none; b=b48WGhZft+8cipylFkpHyG/fkGaUbiIKVK++LMynxYCFL2N7IJUykERKvMxqQyT8ZFDoK7eUtkiMWoKu6OtMKg5eGVOsjXSA+XugoxyvBSF6H0SuXn/g2FoPNsH1mFCAOt7x0lN8wYS5zkFAf9fVtGPO9Sxtwpav1uOCreteLIk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711322181; c=relaxed/simple; bh=IRmiRuxaCVe79WWds/IFxgcx0pw2UqYBA9WRsE0KnHQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WAsxuRzHkIYWPog99BPAAm/dcI3cHwFM/zhf4KygXAPjDJdHpINoLuvjtMxjaY66XW3alOp5oRPBSpasdmo/fd6M9ZPrCXk+qccKV2mSB8jbdLU/DRrR40UotHIKUCviDe1u8jMNiKv9AudOYtxi8cFTuBHDRZYde/bi1EaK3FE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AQmInFfZ; 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="AQmInFfZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 095CEC43390; Sun, 24 Mar 2024 23:16:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711322180; bh=IRmiRuxaCVe79WWds/IFxgcx0pw2UqYBA9WRsE0KnHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AQmInFfZUDAoriUei/Xylg8/8s8K7VnYJzsXiXI/agNYSHsfjR/rgZ76bVcbsehvE 4mFuVJdUJ6Hi2y35AXwgdsExvO2yEekS65rL0H/dGPNB8mp3YoGpKJmSrWTtDhrGG2 pib353gVsWMrohqw9oLAzRSgUGWIMfscAr8XYfwG1HuNwg+Y6iCk5BO1oX4ceEti5G HrZ0cItmEZ7W04CYqMxjMeBtERZQVQ4/O5Xqu0hJnovht/CK/f/99uwoGo6Y/UCEO2 L05IlwbF8aT5BKAJqdwOPKbwkMyQoJvklpLt3n2BDip30Un4ptDt7aKaPQexeKM8WL IPK11yYEHnmFA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Srinivasan Shanmugam , Wyatt Wood , Anthony Koo , Rodrigo Siqueira , Aurabindo Pillai , Alex Deucher , Sasha Levin Subject: [PATCH 6.1 258/451] drm/amd/display: Fix potential NULL pointer dereferences in 'dcn10_set_output_transfer_func()' Date: Sun, 24 Mar 2024 19:08:54 -0400 Message-ID: <20240324231207.1351418-259-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324231207.1351418-1-sashal@kernel.org> References: <20240324231207.1351418-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 Content-Transfer-Encoding: 8bit From: Srinivasan Shanmugam [ Upstream commit 9ccfe80d022df7c595f1925afb31de2232900656 ] The 'stream' pointer is used in dcn10_set_output_transfer_func() before the check if 'stream' is NULL. Fixes the below: drivers/gpu/drm/amd/amdgpu/../display/dc/hwss/dcn10/dcn10_hwseq.c:1892 dcn10_set_output_transfer_func() warn: variable dereferenced before check 'stream' (see line 1875) Fixes: ddef02de0d71 ("drm/amd/display: add null checks before logging") Cc: Wyatt Wood Cc: Anthony Koo Cc: Rodrigo Siqueira Cc: Aurabindo Pillai Signed-off-by: Srinivasan Shanmugam Reviewed-by: Anthony Koo Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c index 009b5861a3fec..d6c5d48c878ec 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c @@ -1854,6 +1854,9 @@ bool dcn10_set_output_transfer_func(struct dc *dc, struct pipe_ctx *pipe_ctx, { struct dpp *dpp = pipe_ctx->plane_res.dpp; + if (!stream) + return false; + if (dpp == NULL) return false; @@ -1876,8 +1879,8 @@ bool dcn10_set_output_transfer_func(struct dc *dc, struct pipe_ctx *pipe_ctx, } else dpp->funcs->dpp_program_regamma_pwl(dpp, NULL, OPP_REGAMMA_BYPASS); - if (stream != NULL && stream->ctx != NULL && - stream->out_transfer_func != NULL) { + if (stream->ctx && + stream->out_transfer_func) { log_tf(stream->ctx, stream->out_transfer_func, dpp->regamma_params.hw_points_num); -- 2.43.0