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 751E6C4167B for ; Tue, 7 Nov 2023 12:32:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234826AbjKGMcR (ORCPT ); Tue, 7 Nov 2023 07:32:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234225AbjKGMbq (ORCPT ); Tue, 7 Nov 2023 07:31:46 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91A2638392; Tue, 7 Nov 2023 04:20:39 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5BB1C433CB; Tue, 7 Nov 2023 12:20:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699359639; bh=epV+MnKVaBHRdg9RgBdQpC5Q5g1JWLFq4Ftpd7OcFdA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IlkbXGjaq9E927BZkWY5FQ/T5QnVl19pwe7IBBpZFRnSCZODDAw579dmVZQHko6d0 K1gOWsr/HszcSi8An89lzzcNsS2NBGpZmOAYTcScr0br99qj7VnOCzDvdO6II5i3Hq F7p1Wyoc0Pvd37nEe5TnqNJF8W9i3G6DwJHwhpDgEa26WGvdMAwKNkBkyieheoeIaX z9JPv3ND6rxqi3HiymSBdWQ5cBTlbhMbv18wiOvdSIbWrnzef1xEr71Fk0drkkUrYa 3mo8aa+iMXL8oh7/yq1GlDIpz6FQWTi5zqSGJRu+Sb0b1XfXSVEaJyqQz5t9960isR Q3D3fOhVwtZhw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ma Ke , Alex Deucher , Sasha Levin , 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 6.6 26/40] drm/radeon: fix a possible null pointer dereference Date: Tue, 7 Nov 2023 07:16:28 -0500 Message-ID: <20231107121837.3759358-26-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231107121837.3759358-1-sashal@kernel.org> References: <20231107121837.3759358-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ma Ke [ Upstream commit 2c1fe3c480f9e1deefd50d4b18be4a046011ee1f ] In radeon_tv_get_modes(), the return value of drm_cvt_mode() is assigned to mode, which will lead to a NULL pointer dereference on failure of drm_cvt_mode(). Add a check to avoid null point dereference. Signed-off-by: Ma Ke Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/radeon/radeon_connectors.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index d2f02c3dfce29..b84b58926106a 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -1119,6 +1119,8 @@ static int radeon_tv_get_modes(struct drm_connector *connector) else { /* only 800x600 is supported right now on pre-avivo chips */ tv_mode = drm_cvt_mode(dev, 800, 600, 60, false, false, false); + if (!tv_mode) + return 0; tv_mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; drm_mode_probed_add(connector, tv_mode); } -- 2.42.0