Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp1653723pxy; Mon, 2 Aug 2021 07:09:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCR/KFtQiPGDbiOloGY4/lLB+18+Fal5sLhLbpuDLshAgTX+tywcKsFSmN4wpzhH0wUtSg X-Received: by 2002:a6b:c90f:: with SMTP id z15mr1770603iof.183.1627913342837; Mon, 02 Aug 2021 07:09:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627913342; cv=none; d=google.com; s=arc-20160816; b=NQ4hC/vcnPSfoT6FmXbN6MlRCxnvNyLGpLEX/pviZFJL1QzFRq9cf4k29N1o9PL/Pa Qt9oRTV+l6M9s3N3dTekgxk3keenTbeJPWvrkh8piHs3Zqgl2s7+8Zgejdw4VgS6yudJ xWLOA4KdEzN7w2XtTcDDGUuGeqgcAfEH7KZepTxfyrP+QiayxUcYJuq5PboZpGjk6fza CeEfRDSLn/teU+xKa4nhAuTPWkN9eSjxq8pF4bg3SuMtHM8KfpLvcYhw/bjPbBg8zzJO CX1tQSdaejZ1+clPPDjx3YO6u9/7VI05PDoKyHbmiwNjxlwT3oI7IFSDgwQqIA0Hrord 7dig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1iZWKcJuX532Nc+3gOJab/GXJfm9DIQV2IjCfGj5YIc=; b=xUMayDent2wG4jMf12WkRsQ6m2kcDHjUeUQPLp+nBPXbD0S2Hg/KoiLf9ansN3ZDUO 17ehHoUebEMaQS68BUH01ybMkd5wxRpMQki3ynTHdQagRFafHvZ3oXcnZ2nshbWLQXr2 BnEWnTYJuu8MNLyYlvkilvuBFL9e+tY4Zzjt/5spVsGzeNonozHyYhAWf3xnDJyogvAP lnwInooAor9IlVZmtLr//ER/V9MXiOTKpsv+m6hYZKA2py6DAlW3NIqOm0iWBDcnBNtO yXRB1J8kFVJVdNE8ZOMgujXVkk4OGhRPJT5vHb5jo0xm8GMpNU0YantGcIplEGoaPnYW SOiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tDw+0BlO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d21si708969jam.9.2021.08.02.07.08.51; Mon, 02 Aug 2021 07:09:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tDw+0BlO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237762AbhHBOFB (ORCPT + 99 others); Mon, 2 Aug 2021 10:05:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:40684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236054AbhHBN6a (ORCPT ); Mon, 2 Aug 2021 09:58:30 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 65D7D61057; Mon, 2 Aug 2021 13:55:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627912515; bh=y/AA8DFSDyJWtCM/vYw+W485KR8wyONVOF3AFcNnqEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tDw+0BlOkaT0b2esiOn6UoZFuegdrbvCNNm3qDsDIc0YFJd/CBmTdOa42rH3BvIw6 YI2wUxuBaQ0BeYrFIP6b6HjVOLd2yn5f1ZX2F271166SsssTwKtYK3LIL/ndF+1MUy ejxvw1JnK93qEOqdUkLKiqCXkPe7XQYXcBQzBVlE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vojtech Pavlik , Jiri Kosina , Alex Deucher Subject: [PATCH 5.13 028/104] drm/amdgpu: Fix resource leak on probe error path Date: Mon, 2 Aug 2021 15:44:25 +0200 Message-Id: <20210802134344.947755986@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210802134344.028226640@linuxfoundation.org> References: <20210802134344.028226640@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Kosina commit d47255d3f87338164762ac56df1f28d751e27246 upstream. This reverts commit 4192f7b5768912ceda82be2f83c87ea7181f9980. It is not true (as stated in the reverted commit changelog) that we never unmap the BAR on failure; it actually does happen properly on amdgpu_driver_load_kms() -> amdgpu_driver_unload_kms() -> amdgpu_device_fini() error path. What's worse, this commit actually completely breaks resource freeing on probe failure (like e.g. failure to load microcode), as amdgpu_driver_unload_kms() notices adev->rmmio being NULL and bails too early, leaving all the resources that'd normally be freed in amdgpu_acpi_fini() and amdgpu_device_fini() still hanging around, leading to all sorts of oopses when someone tries to, for example, access the sysfs and procfs resources which are still around while the driver is gone. Fixes: 4192f7b57689 ("drm/amdgpu: unmap register bar on device init failure") Reported-by: Vojtech Pavlik Signed-off-by: Jiri Kosina Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3412,13 +3412,13 @@ int amdgpu_device_init(struct amdgpu_dev r = amdgpu_device_get_job_timeout_settings(adev); if (r) { dev_err(adev->dev, "invalid lockup_timeout parameter syntax\n"); - goto failed_unmap; + return r; } /* early init functions */ r = amdgpu_device_ip_early_init(adev); if (r) - goto failed_unmap; + return r; /* doorbell bar mapping and doorbell index init*/ amdgpu_device_doorbell_init(adev); @@ -3644,10 +3644,6 @@ release_ras_con: failed: amdgpu_vf_error_trans_all(adev); -failed_unmap: - iounmap(adev->rmmio); - adev->rmmio = NULL; - return r; }