From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE0923E169E for ; Wed, 8 Jul 2026 07:33:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783495995; cv=none; b=Dra2jtOxG23f0ijKenclSiRRNS4ORrSQ/F3/u+PlHHeJ4PnZ4RWbike7KqDvxJQyYoHrsPAabiloXSpXKig7tIf8A+VTnWPb4/zX0GgyXVo/bThT88J1ZkqfH7du9Zi3LquCqdbhChf3+VcQrVlu7nqO1qY50nkBmW9MVlVzMmE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783495995; c=relaxed/simple; bh=qSY9hlRvyFGAWFWs17kZGm8u6DC9Dzopz2zWoO+Swew=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Y0pqTU31pKrAcCquPXeVKMYg//rVpZ6QfqBWSZ9qNzWLgCjqqKOur64SJtL0C51MypdlakAAxPBxJwbP5qrbOqPfTDhRQAktXAFCp8BO/vqlgqnmmU5/fbOyN1rAijhzjnjhiHgMQYPXN8YWIFhDhowkRSOw51XJJsfSObesQA0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=V4jDNpjs; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="V4jDNpjs" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2ca70925c25so5309065ad.1 for ; Wed, 08 Jul 2026 00:33:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783495974; x=1784100774; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=Keeefd38WvRLYS9r2pdjAYV6V+Tg/ODVFYOu8UceE3I=; b=V4jDNpjs+0shOV6iFPkj77a+JDjYMfzT5TmeHPLCBlG2sZwPUTxdJ6ORlLXkodHnjf ZCo+/uyqIUQgU8MsR8X3j2v0SKhHkfdqfOis6PkdMiZVSWkIrtEEVwVHB1elL+EVicuM YZKp2iu85t1x2O4AGe9sxyC9icRWuSmNOdL3rgvWP9R15InQNfG/J96RmhHG6Yl7+Y/o RlQBZFu7cOv5CkDLzsB68AVC4WH/wzjESkgyCuOjUx9nn6ozCYClDnsAw2bDhbadQ1RO WcS++0Q4aBRdTsbkJc5bDv6xS5qIHqVTtGMHRmjWvGQo0Rj2ZCYx/hJ/uBfXUXQvn8MR cOGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783495974; x=1784100774; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Keeefd38WvRLYS9r2pdjAYV6V+Tg/ODVFYOu8UceE3I=; b=EvbKGU0LVXwV0hqTK5/nQrPlJ5Y5Dk4ubPuSAN0Pu3iYauSnZ6PEu6XTKE8VnuV3b+ lJY59Ju2WR/d3I/Uc+v3mVbFBFZXHMItKiu0a9Lgssh9ZpnT6UXBMxIFN7iqBJsw0Yp5 AGTVJqQ06ZY68hUk2ViGF+2WroHr6wMGXgSbGQla3pSuGiNitFa+UYuow0ZivKhkb0aN oMaGjmzxhtEkQ3bxi0rW4cXK2P23kDgCY5eS6zN0HAF7hDjimiHK+MaAO5Ksc7cFW1BS IBwRRdVZ9xHcqr4XSRZPnVdej3F30k7Hr5d7cM9ll8x5munCUn1KYqLO9q37cyF3oErc aF6Q== X-Forwarded-Encrypted: i=1; AHgh+RqrmHxV3f+0fSL3eZT1pzOxSNJtpdWNt/1no0wgbkv3IhYlBGV9DwdyH0sKLJqvckKxUq9tnAeM3xmovxw=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4UquvCGcRlBpal5Jymfv2dRFX6LlPLkaNuDO11v7jQ/jXsXAJ 1sUUDQwsAhpz7Faw7AtJdGF2+8wkpOC5LEqmRwLbmj35nCmyy5sWfq1M X-Gm-Gg: AfdE7cmF/dpTVrGpfH5L2Zu0bvV0LaUxKCo0oWEjPvIid3qiq/vXjuCy7X+ERhaFIDZ 5zr61mNvdF7TugQe26DLu3tPjTojxD+4xWw9vJ+BbcbPyJgdKFcnnQ+2qhmycOi6pSd7qzNzLNU TWV5xhl3OaxfCkXy8pYE0p4Gdx+Vi36C5sBB6A7en62h+pUDPq+Hs1BnNZGWWDIlGV0/Ip62gy4 6pbixUwnsLbQsnyW6Qbnwv3EE+Z5YHisYwTeH79HRXdKh6yj77Xlg3Clk68Nat/njZAoEKSscbw /JZgO3IBA4Yn5AM2RlZ0M/mRpCfcxnkO9b47RsPTZTB8bci2X8xap7nLwbsrBzTCXqLvdiRMlWi uHIMmfVOwSxFO8e848eEjcftz9+4nxEqE5t1KV0r6HP5n/ZVWOSHISqfWMpOkmA70lCk3+Pg= X-Received: by 2002:a17:903:b86:b0:2ca:bb6:e7c6 with SMTP id d9443c01a7336-2ccea36e129mr14778595ad.37.1783495974343; Wed, 08 Jul 2026 00:32:54 -0700 (PDT) Received: from lgs.. ([2001:250:5800:1000::f280]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d3d2efsm23314995ad.64.2026.07.08.00.32.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 00:32:53 -0700 (PDT) From: Guangshuo Li To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , David Airlie , Simona Vetter , Mario Limonciello , Alex Hung , "Mario Limonciello (AMD)" , =?UTF-8?q?Timur=20Krist=C3=B3f?= , Ivan Lipski , Aurabindo Pillai , Ray Wu , Chenyu Chen , Maxime Ripard , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Guangshuo Li Subject: [PATCH] drm/amd/display: move connector state dereference after NULL check Date: Wed, 8 Jul 2026 15:27:51 +0800 Message-ID: <20260708072751.724400-1-lgs201920130244@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit amdgpu_dm_connector_atomic_check() checks whether the old or new connector state returned by the atomic helpers is NULL before using those pointers. However, new_con_state is already dereferenced while initializing crtc, before the NULL check is reached. If drm_atomic_get_new_connector_state() returns NULL, the function can dereference the NULL pointer before the WARN_ON() check can handle it. Declare crtc first and initialize it only after the NULL check has succeeded. Fixes: 1e5e8d672fec ("drm/amd/display: Avoid a NULL pointer dereference") Signed-off-by: Guangshuo Li --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 d3a8d681227a..7b040fd7e3fb 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -8640,13 +8640,14 @@ amdgpu_dm_connector_atomic_check(struct drm_connector *conn, drm_atomic_get_new_connector_state(state, conn); struct drm_connector_state *old_con_state = drm_atomic_get_old_connector_state(state, conn); - struct drm_crtc *crtc = new_con_state->crtc; + struct drm_crtc *crtc; struct drm_crtc_state *new_crtc_state; struct amdgpu_dm_connector *aconn = to_amdgpu_dm_connector(conn); int ret; if (WARN_ON(unlikely(!old_con_state || !new_con_state))) return -EINVAL; + crtc = new_con_state->crtc; trace_amdgpu_dm_connector_atomic_check(new_con_state); -- 2.43.0