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 74A001E6E59; Thu, 1 Aug 2024 00:39:59 +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=1722472799; cv=none; b=F6qktNl6u5xxzqz32xm2s1X1bmCTuHb4HM6+wRHC0ReKbwYSle1ioyTEtO49XkEamMpXMoL9cQyk5CGK9SH83+plaE6JibV2nqM081gymsllAE8KaiTfLTvVMUNq0ENO2v+bIHJenAUUCmgDttELHlKOn/V8FAMaS3uld52K8bI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722472799; c=relaxed/simple; bh=r8EFgXogzRkl5bdeMIqgYvAU62nrklDUVfI4YKX8EP0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PVJxG+0mmsDpi7Ws57pdlZ7Jtj+cDuBZfMQi4b7Y1UHw09VbTeThL0+D6sOd6KqATTtrjxu2RYCJ1aF7BpsZK/vvm3g5lKyJvhB0Ahk4bCOvpq2KQjB1HA9zdwNMGQKeZdcpRQNS5naz5oWSMcm10Cm+W+svCOm7PtcLjmzEe+I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tT2aSMiy; 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="tT2aSMiy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53E90C116B1; Thu, 1 Aug 2024 00:39:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722472799; bh=r8EFgXogzRkl5bdeMIqgYvAU62nrklDUVfI4YKX8EP0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tT2aSMiyzLtWapQJv4PRoNZxQO3Z7mBaigzvB8Qo9zj6MQyTSFgZbbMBKAr23ID5u usMbREwr4sIpxNafuKoX2FuNaU63OfIO7ER9VldI4qONA1bwSwkXbO9xy2ZfgmcnwM LEnqNmhz/aFlyxX7gQiQ+L4D8oHxawS3VL2VguBDHFQxWhfmBK18dcHnKNZ3QgD5hW OY9w19PiyDua0dOAz9u2F10Gp2qJtsSMN9eFRWrB30cCcchGwd1F0P/OhNJeNiBrqG ERfoitpO1JfGVL14vrraXfpHzu2C1nlAVYdcfVX9TVl9C5DHI4aV9EebCUObaSDI9N s7iRx9vUpd2JQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Hung , Harry Wentland , Hamza Mahfooz , Alex Deucher , Sasha Levin , sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.4 11/22] drm/amd/display: Skip wbscl_set_scaler_filter if filter is null Date: Wed, 31 Jul 2024 20:38:40 -0400 Message-ID: <20240801003918.3939431-11-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240801003918.3939431-1-sashal@kernel.org> References: <20240801003918.3939431-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 5.4.281 Content-Transfer-Encoding: 8bit From: Alex Hung [ Upstream commit c4d31653c03b90e51515b1380115d1aedad925dd ] Callers can pass null in filter (i.e. from returned from the function wbscl_get_filter_coeffs_16p) and a null check is added to ensure that is not the case. This fixes 4 NULL_RETURNS issues reported by Coverity. Reviewed-by: Harry Wentland Acked-by: Hamza Mahfooz Signed-off-by: Alex Hung Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb_scl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb_scl.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb_scl.c index cd8bc92ce3ba9..4058a4fd6b224 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb_scl.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb_scl.c @@ -690,6 +690,9 @@ static void wbscl_set_scaler_filter( int pair; uint16_t odd_coef, even_coef; + if (!filter) + return; + for (phase = 0; phase < (NUM_PHASES / 2 + 1); phase++) { for (pair = 0; pair < tap_pairs; pair++) { even_coef = filter[phase * taps + 2 * pair]; -- 2.43.0