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 110A92571B3; Thu, 17 Apr 2025 18:02:17 +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=1744912937; cv=none; b=G+9JRyDLTWtOqFMqIiGEZfJ0aDyE+0aXWE5TTQgs4TBQYPew+9fpaazJR3MLpQtbaQkuRj6coi5bThv0cViX3vzO4Qe22jeDDWI+eegDddR2kJpqlMKB+IEfGuU186fxygOfR1m8sg0sguQ6bi2voCtaTe2b0Lfe/eb4l7udOZA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744912937; c=relaxed/simple; bh=FLwmWYQ8XRFKt6bQZFH50ugZ61R9p3txAJSbUNg9Pi0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S6CX9pL82slAjXUy6M/hbYP9anYLrUNp7n4mpJ9cbrQAgTy90Ed2uA5SkI/UOtFOylonWGZ5NZ2WSk36a9wzjN9XXXeE2oMLDlmHlJ+V8D5H1MFsPxslGyvc6wPUt189gNbTUD9fxsoN60zrg+gaa+6b7NV+hKU/pLUyyt82U6A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pBNpvucs; 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="pBNpvucs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9030AC4CEE4; Thu, 17 Apr 2025 18:02:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744912936; bh=FLwmWYQ8XRFKt6bQZFH50ugZ61R9p3txAJSbUNg9Pi0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pBNpvucsvDrT4wxScKQ2DAdZF+4eCCJX3IkgTOi1k7/uH4l5mlKQm0VO1CgPMEeCJ clXnqdofP9pmf6y6pYOVZBC/EoGrRRhTiLIOEsXVVZSVAfs4iHFczZikakeTt7p/WZ nzxOB2mRmul2qJse7s9cKTeoCHK84l6EBAOCUlFE= 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.14 174/449] drm/amdgpu: handle amdgpu_cgs_create_device() errors in amd_powerplay_create() Date: Thu, 17 Apr 2025 19:47:42 +0200 Message-ID: <20250417175124.986638435@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250417175117.964400335@linuxfoundation.org> References: <20250417175117.964400335@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.14-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 686345f75f264..6cd327fecebbc 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