From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 4E35B2571D2; Thu, 17 Apr 2025 18:24:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744914246; cv=none; b=THDudeYp28wroNqM0g66uyQ1YUk7Q/5sTeCTuYihY34ZQg+S+W0ltVF2K7BAG5FhirTVI8Q616HkyNDCuAWYXFofJ5foeMe+1d3RxMlKvND7AGbV47IvmW2zBjlMVZFXFdVz6dBfoq7S0QmSKOEOgvlvsO742ltDFRJHlFltrik= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744914246; c=relaxed/simple; bh=9Fr3JSiZzQdjHuO2BSxsNWTtE7xk7Zjh4+BWiI4GLyI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TZbrcUa0AxbJmP2KznUXkw2K1mQr/kVwStim89qk9pfAva5HbjLK4PiOoc6eZnyx00mDLy52GNwOElZ1R2pixafN+CynCCvmgAXflqOBKypuxVT7pioO3bi68NAucpT7WZLCJN+yfjBhbuvSiwadrQpjsK8OalQKtc8RixH5M+Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=qWJiAXn7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="qWJiAXn7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B878CC4CEE4; Thu, 17 Apr 2025 18:24:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744914246; bh=9Fr3JSiZzQdjHuO2BSxsNWTtE7xk7Zjh4+BWiI4GLyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qWJiAXn7zxy8efKjk3QwYltI6ZMizbHoQT4tFpC7FM5zi4D1OEOJOEJOnVP2NFc5k CeHZcIY2tWRgR2LGYRdi/+yKgEBmlW5Oq30qH0jEpQYP8PWiDRqlSWprDUmynhxhv1 DKwg5vT+hSHFo68aDK5KaiTq5s4E1Mn1osLfTFJM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wentao Liang , Alex Deucher , Sasha Levin Subject: [PATCH 6.13 154/414] drm/amdgpu: handle amdgpu_cgs_create_device() errors in amd_powerplay_create() Date: Thu, 17 Apr 2025 19:48:32 +0200 Message-ID: <20250417175117.630875512@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250417175111.386381660@linuxfoundation.org> References: <20250417175111.386381660@linuxfoundation.org> User-Agent: quilt/0.68 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 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wentao Liang [ Upstream commit 1435e895d4fc967d64e9f5bf81e992ac32f5ac76 ] Add error handling to propagate amdgpu_cgs_create_device() failures to the caller. When amdgpu_cgs_create_device() fails, release hwmgr and return -ENOMEM to prevent null pointer dereference. [v1]->[v2]: Change error code from -EINVAL to -ENOMEM. Free hwmgr. Signed-off-by: Wentao Liang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c index 26624a716fc60..f8434158a4022 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c +++ b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c @@ -51,6 +51,11 @@ static int amd_powerplay_create(struct amdgpu_device *adev) hwmgr->adev = adev; hwmgr->not_vf = !amdgpu_sriov_vf(adev); hwmgr->device = amdgpu_cgs_create_device(adev); + if (!hwmgr->device) { + kfree(hwmgr); + return -ENOMEM; + } + mutex_init(&hwmgr->msg_lock); hwmgr->chip_family = adev->family; hwmgr->chip_id = adev->asic_type; -- 2.39.5