From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 1A47D3C1419; Sat, 12 Sep 2026 07:15:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789197307; cv=none; b=eDDamDQ+AoSc8661s7Vz6qwmgK1pTGlwhnKyjLi0NQOSdnk3eg9+RxRWXMeEaatqCKcX7XKMAMqroLQ9qoYDTwJiNJadNhrV8hLyRLnOAfr2W2cibevvfUfGY54ownu0JNBKukV6yIKEF/CdAnT6dpdTk9sMHT5dMrcmZWgHg3U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789197307; c=relaxed/simple; bh=AwhNov5tDR4S7wJHc1aIdONBOd2JIBwynMeKnL7u+ps=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Opbt6oE8GF3BrM7g8kdvOIv0eh04Lsu74PsjwLXFKfXozdhiNyLHfksgmCzjhxwfrDiYtxiOZYbMVnRWnH35ydT2NgCOiDEGkt+W7HvlxCbnPhv5HQpmvivwSyzr3b0JX/nVu+lG+2su2NxFG1v63QnHLwkY9Pww0prwXDUDqMk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tzq8Ni/3; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="tzq8Ni/3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6A801F000FF; Sat, 12 Sep 2026 07:15:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789197305; bh=+dtdXdaaYiR3hxBcTxz1AJKSNQoYt827fAJ6PRZ3XDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tzq8Ni/3X5cBF1iM0xapi8kBOEoKZAT/7QriFlu3nfYC3yHy52qdjlstauw4INwrY wEAYNQ/kTsopMuexVyMT3DIqyfBkJqzGIk3aYUreN9c7fXldgBSel1rPZsCEt/qudq RX71s65nZHGMzIAr+OwRxSlZRik0WDHlZJbbtSiQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Evgenii Burenchev , "Mario Limonciello (AMD)" , Mario Limonciello , Alex Deucher , Sasha Levin Subject: [PATCH 7.2 0148/1815] drm/amd/display: Fix dangling pointer in CRTC reset function Date: Sat, 12 Sep 2026 08:31:38 +0200 Message-ID: <20260912065652.490885702@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065648.999753832@linuxfoundation.org> References: <20260912065648.999753832@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.2-stable review patch. If anyone has any objections, please let me know. ------------------ From: Evgenii Burenchev [ Upstream commit 0aeed866cb938943908c3ba46422128e49d2d080 ] amdgpu_dm_crtc_reset_state() frees the old state before allocating a new one. If kzalloc() fails, the function returns without updating the state pointer, leaving a dangling pointer to already freed memory. Fix this by allocating the new state first. On allocation failure, the old state remains untouched and the function safely returns. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: e7b07ceef2a6 ("drm/amd/display: Merge amdgpu_dm_crtc and dm_crtc_state") Signed-off-by: Evgenii Burenchev Reviewed-by: Mario Limonciello (AMD) Link: https://patch.msgid.link/20260629090435.9729-4-evg28bur@yandex.ru [adjust for movement around current amd-staging-drm-next] Signed-off-by: Mario Limonciello Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c index 56bf907f1f6cc..f47ee9937adaa 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c @@ -464,13 +464,13 @@ static void amdgpu_dm_crtc_reset_state(struct drm_crtc *crtc) { struct dm_crtc_state *state; - if (crtc->state) - amdgpu_dm_crtc_destroy_state(crtc, crtc->state); - state = kzalloc_obj(*state); - if (WARN_ON(!state)) + if (!state) return; + if (crtc->state) + amdgpu_dm_crtc_destroy_state(crtc, crtc->state); + __drm_atomic_helper_crtc_reset(crtc, &state->base); } -- 2.53.0