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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60F0CC433DB for ; Mon, 28 Dec 2020 03:58:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2315120867 for ; Mon, 28 Dec 2020 03:58:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726354AbgL1D6h (ORCPT ); Sun, 27 Dec 2020 22:58:37 -0500 Received: from m15111.mail.126.com ([220.181.15.111]:57842 "EHLO m15111.mail.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726242AbgL1D6g (ORCPT ); Sun, 27 Dec 2020 22:58:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=z0RBXr31F2ios8V7Fp YTtcsONT7xFb8GSiDADGswyOk=; b=gycD6y1lGtSW6CsapTcIjnhVgeOQL0z8Ry wRCuSjI5UTifBBQr6VeKjTlpgAA195GAZXyHjfpNIQogNCphJ6yt71u2NjzAPyso 6NkhbUDmgy5H+AmPirR7psidac6C6Jeh+6SA3m/3Vo+/2FTFmyY0vItOo0hZfKng 1hS+vWQG0= Received: from localhost.localdomain (unknown [36.112.86.14]) by smtp1 (Coremail) with SMTP id C8mowACXWUmZV+lfp_UtNA--.28418S2; Mon, 28 Dec 2020 11:57:15 +0800 (CST) From: Defang Bo To: airlied@linux.ie, daniel@ffwll.ch Cc: nicholas.kazlauskas@amd.com, Rodrigo.Siqueira@amd.com, aurabindo.pillai@amd.com, stylon.wang@amd.com, Bhawanpreet.Lakha@amd.com, hersenxs.wu@amd.com, amonakov@ispras.ru, luben.tuikov@amd.com, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Defang Bo Subject: [PATCH] drm/amd/display: avoid null pointer dereference in dm_set_vblank Date: Mon, 28 Dec 2020 11:57:06 +0800 Message-Id: <1609127826-264749-1-git-send-email-bodefang@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: C8mowACXWUmZV+lfp_UtNA--.28418S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7CFykXw1kur48JFWrKw18AFb_yoW8XF1fpr s3JFyjqr48ZF1xW3srCF109r98K393Xa48GrW3Cw1aga4UAwn8Cw1rArZ2gw47WFWxC3y7 XFy7CFW3Z3Wq9w7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UKQ6XUUUUU= X-Originating-IP: [36.112.86.14] X-CM-SenderInfo: pergvwxdqjqiyswou0bp/1tbitRIJ11pECvx6lgAAs9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [Why] Similar to commit("drm/amd/display: Guard against null crtc in CRC IRQ"), a null pointer deference can occur if crtc is null in dm_set_vblank. [How] Check that CRTC is non-null before accessing its fields. Signed-off-by: Defang Bo --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index e2b23486..f820962 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4875,11 +4875,19 @@ static inline int dm_set_vupdate_irq(struct drm_crtc *crtc, bool enable) static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable) { enum dc_irq_source irq_source; - struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc); - struct amdgpu_device *adev = drm_to_adev(crtc->dev); - struct dm_crtc_state *acrtc_state = to_dm_crtc_state(crtc->state); + struct amdgpu_crtc *acrtc; + struct amdgpu_device *adev; + struct dm_crtc_state *acrtc_state; int rc = 0; + if (crtc == NULL) + return -EINVAL; + + acrtc = to_amdgpu_crtc(crtc); + adev = drm_to_adev(crtc->dev); + acrtc_state = to_dm_crtc_state(crtc->state); + + if (enable) { /* vblank irq on -> Only need vupdate irq in vrr mode */ if (amdgpu_dm_vrr_active(acrtc_state)) -- 2.7.4