From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8B6CC4167D for ; Sun, 12 Nov 2023 14:22:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232971AbjKLNaz (ORCPT ); Sun, 12 Nov 2023 08:30:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231636AbjKLN2z (ORCPT ); Sun, 12 Nov 2023 08:28:55 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 582D93862; Sun, 12 Nov 2023 05:28:45 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90F4AC433C8; Sun, 12 Nov 2023 13:28:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699795724; bh=hdxK28Eo9S+RouVwlhaxKIMABP/G5jYBzxIG3cQQP5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k6n9QtaNKW9qGyDzFQwLnqg0Mos86ZiRmff1hCLvoIlThx8b5z+DbnOW6aLKUm6fx wsvaqUgiburg6FccKXQAG8xArVZR5SzqqXisICVJkwPL15fkFJMChQk96CrblwZY+z FFX3xQExeehphz3x0tTTwnI8EPqDn651QpKDCfjTsxMl7rLVoX8zgd3FgCFfhxOHEG 4Pp3CQdTjvM2iAU3h0eNHg+44j9/q5keqqsRLgY7KcDAH5HOxNcVnG+0sD2QjIvn/x u8v83QXA3oZapTXrpKeK33nwOqBTtFYi/gQryanHWi6rQM7aAuupnIOozDO9YTXhts whzVic5Y+3sbg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wayne Lin , Jun Lei , Hersen Wu , Daniel Wheeler , Alex Deucher , Sasha Levin , christian.koenig@amd.com, airlied@linux.ie, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.15 9/9] drm/amd/display: Avoid NULL dereference of timing generator Date: Sun, 12 Nov 2023 08:28:29 -0500 Message-ID: <20231112132830.176228-9-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231112132830.176228-1-sashal@kernel.org> References: <20231112132830.176228-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.138 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wayne Lin [ Upstream commit b1904ed480cee3f9f4036ea0e36d139cb5fee2d6 ] [Why & How] Check whether assigned timing generator is NULL or not before accessing its funcs to prevent NULL dereference. Reviewed-by: Jun Lei Acked-by: Hersen Wu Signed-off-by: Wayne Lin Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c index f0f54f4d3d9bc..5dd57cf170f51 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c @@ -562,7 +562,7 @@ uint32_t dc_stream_get_vblank_counter(const struct dc_stream_state *stream) for (i = 0; i < MAX_PIPES; i++) { struct timing_generator *tg = res_ctx->pipe_ctx[i].stream_res.tg; - if (res_ctx->pipe_ctx[i].stream != stream) + if (res_ctx->pipe_ctx[i].stream != stream || !tg) continue; return tg->funcs->get_frame_count(tg); @@ -621,7 +621,7 @@ bool dc_stream_get_scanoutpos(const struct dc_stream_state *stream, for (i = 0; i < MAX_PIPES; i++) { struct timing_generator *tg = res_ctx->pipe_ctx[i].stream_res.tg; - if (res_ctx->pipe_ctx[i].stream != stream) + if (res_ctx->pipe_ctx[i].stream != stream || !tg) continue; tg->funcs->get_scanoutpos(tg, -- 2.42.0