Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp414734pxa; Fri, 21 Aug 2020 10:27:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTu23O+Lwkv/ajiA+rVOcybmDDNEvjuwxU4wji/wUl2O7ZG57e9ZBariqygr0Ajy0i2PBz X-Received: by 2002:a17:906:6cd:: with SMTP id v13mr3760059ejb.307.1598030863711; Fri, 21 Aug 2020 10:27:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598030863; cv=none; d=google.com; s=arc-20160816; b=Kl4MVm1zFmNa3sR/1g/k5q1t6cLAM6Q1nNyDt5hhSxMwmPmlQ8R2pBUyOhw58InhA2 V9Nf3JaT1JRp4gRbUW3DoZI3QToKntEJ65+On3FVDjrKkjxmPOfcMr0bo4nChgneSNiE 654rWS3OST9YOkCmwvKwbraOh4kn0fam0tTD4v+HF9MCfyPUjKwIlfkx/WRvcTZx6E++ DegEyqhCIm5NWUYNpovpJ/un8CvgVfYiIsQ6z/q2KFvwuKpWi2TMeej42E8iJhuTn0PR RREzY95zHxfE3iz+gVui3E2Xt/YLQBn/D5tlzZpXDMtVz1jNOEZlb5Y6A6tjv+q7n99B KTUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kBBtVD3iuMKgSOq8zaxYylL2AKWdjjvI3nhlNHc23Tg=; b=xxTTRzT+GJO8pcMKcrZcfyK550MC0O48BBC94Az4MSdB7lOimHRJcoCxrZPeb/YsgZ n3q2AzDB5VPCYrqVzXVnyoBEVeuAfh7Pn7F0glEHTfPSdQiOF5jUIQ1g3ON+iAD6Bdvc WCiZYzJQ5CCb3to7Htg965MRBRkR47Y/7chAJJ/CPUWoZ+Yj7BWirXcDKOHNpO5RJ0Q9 3hQhLrSu3YgH5l1l5D7pJFPL/hM70ua5L7hwMKXnGVKg8/l8J8QhBZSi68HgVc4BUc7j g1ZJuQAYfaerYs7DoZsyNYFLK0xv3VpNRe7cEntxlWP6ZSMuls6EJYORHms42r6bZWtu sZsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OC5ysrM+; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id zn8si1786622ejb.70.2020.08.21.10.27.19; Fri, 21 Aug 2020 10:27:43 -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=@kernel.org header.s=default header.b=OC5ysrM+; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729119AbgHUR0n (ORCPT + 99 others); Fri, 21 Aug 2020 13:26:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:46552 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727108AbgHUQO4 (ORCPT ); Fri, 21 Aug 2020 12:14:56 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 287922086A; Fri, 21 Aug 2020 16:14:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598026495; bh=GwiJXLRvB5e9CxSOmoT4bs9rK/an/E+PE8TN3zdX0ds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OC5ysrM+jdhtDH8I7TKfXYJ9JhCJo3d+ZYLSQmRojDYchPYBWMGCUCGHIAYn+r8jW CAgzHhl0SJTnKD3Ib4YyRG/ovkf9ic6ScUq/HdmSMKIbFugWouyF90VZkoyzr+7OYR VisLhkYVgnnNcJ4MtMqCp1rlZHh4lznLVMn4NJaI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Navid Emamdoost , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.8 26/62] drm/amdgpu/display: fix ref count leak when pm_runtime_get_sync fails Date: Fri, 21 Aug 2020 12:13:47 -0400 Message-Id: <20200821161423.347071-26-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200821161423.347071-1-sashal@kernel.org> References: <20200821161423.347071-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Navid Emamdoost [ Upstream commit f79f94765f8c39db0b7dec1d335ab046aac03f20 ] The call to pm_runtime_get_sync increments the counter even in case of failure, leading to incorrect ref count. In case of failure, decrement the ref count before returning. Signed-off-by: Navid Emamdoost Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index f355d9a752d29..a1aec205435de 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c @@ -716,8 +716,10 @@ amdgpu_connector_lvds_detect(struct drm_connector *connector, bool force) if (!drm_kms_helper_is_poll_worker()) { r = pm_runtime_get_sync(connector->dev->dev); - if (r < 0) + if (r < 0) { + pm_runtime_put_autosuspend(connector->dev->dev); return connector_status_disconnected; + } } if (encoder) { @@ -854,8 +856,10 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force) if (!drm_kms_helper_is_poll_worker()) { r = pm_runtime_get_sync(connector->dev->dev); - if (r < 0) + if (r < 0) { + pm_runtime_put_autosuspend(connector->dev->dev); return connector_status_disconnected; + } } encoder = amdgpu_connector_best_single_encoder(connector); @@ -977,8 +981,10 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force) if (!drm_kms_helper_is_poll_worker()) { r = pm_runtime_get_sync(connector->dev->dev); - if (r < 0) + if (r < 0) { + pm_runtime_put_autosuspend(connector->dev->dev); return connector_status_disconnected; + } } if (!force && amdgpu_connector_check_hpd_status_unchanged(connector)) { @@ -1328,8 +1334,10 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force) if (!drm_kms_helper_is_poll_worker()) { r = pm_runtime_get_sync(connector->dev->dev); - if (r < 0) + if (r < 0) { + pm_runtime_put_autosuspend(connector->dev->dev); return connector_status_disconnected; + } } if (!force && amdgpu_connector_check_hpd_status_unchanged(connector)) { -- 2.25.1