Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp416392pxa; Fri, 21 Aug 2020 10:30:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxhlOgGU75O9hoZcXLxbe1wU52N+HZUYeJoOKg8JJF2UrCV7q/ZtGZmH5yW+yKpLfLnxtcf X-Received: by 2002:aa7:c406:: with SMTP id j6mr3804516edq.143.1598031023103; Fri, 21 Aug 2020 10:30:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598031023; cv=none; d=google.com; s=arc-20160816; b=cQYB9dI4e0OmtNvi+BIT1OZkz6bpjQovEEIB1vNqUfVT3B5yhXnQ/mMfcuhBaZzjU+ GxJVNRkMQV/Ww/zzCnkxR1jHEjJNIrhJmmj10CLASmY8uELooqBl+Vv/dh65OLDLAT5I 8cjAovBIbHgjeh2J+HX8IUGNXWlwoGPjyetGo2P/y2izYY9NtwxiTgnrtzf3WefNe/3l VWiUXKVBW8K8BT4b0wgkvSWE+ATV6RU2TF65s/zu/q0FFuUVjOpiJbI6DndMbMC3GkZ0 hstDWabwP+fQKVNHW2OJ3ydBzDhG18wMCyNq21leDFwe+F5wwxFWphJ7+0rj5FmjDDIi YHug== 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=Lq1jJC1p23ApUHU8TR9Vo4mUGkLGnJ1MQz7biwTUhDs=; b=V7uLmW/ssu0ZQR9zg/Gr3Su4SUb+5+yyUhazS+AqliTcB1Vm3ZZ/VjNSoH98UnlOqo 39OQYdDmS86I/Sq2gbUG3fSirQvMohD7ql7DLkjQbo38IHqwGcKNkU4f+xsKIdwrRIKy 51fj5Q7zqMrKCWV8qZd1qJABs+ofos3500fX+9IarLoL4vIJZkgiIHCAlJVzN1G/530P avmyWWAJ21VWn0AQAb3h9Kul6nYCH0/gckACWmet4ub1jjCBJdFfjIa4e9hcf3hVvEtj bD6OxUPmbZnUzR3/PYN9POFUEuNRlpL5lkwl9LG8rixrJ7oz+GpxRYMSdTxS0CV37hf3 y6VA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Bknph+4r; 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 p5si1466064edp.481.2020.08.21.10.29.59; Fri, 21 Aug 2020 10:30:23 -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=Bknph+4r; 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 S1728722AbgHUR11 (ORCPT + 99 others); Fri, 21 Aug 2020 13:27:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:46630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727077AbgHUQOv (ORCPT ); Fri, 21 Aug 2020 12:14:51 -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 4CCA622B43; Fri, 21 Aug 2020 16:14:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598026491; bh=SZsiREGE4KJceeQbEtHOnO+GBKVXcEKF/BC7sEucQvI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bknph+4rERMgskheMWGV8NHhtO8xWLucaY2dnLi62MLI2FEU28tmybp1WTuKs/MV+ d9UflDwv8WOgfIHUYBBFU5TtfVfqNyw9cMA020Oov3kNahHr7Vl8ETHA11oQwUcEfj 0imZl27YoUEGtQ22NADh8wTO1KzkEuvmLPY61TeA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aditya Pakki , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.8 22/62] drm/radeon: fix multiple reference count leak Date: Fri, 21 Aug 2020 12:13:43 -0400 Message-Id: <20200821161423.347071-22-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: Aditya Pakki [ Upstream commit 6f2e8acdb48ed166b65d47837c31b177460491ec ] On calling pm_runtime_get_sync() the reference count of the device is incremented. In case of failure, decrement the reference count before returning the error. Signed-off-by: Aditya Pakki Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/radeon/radeon_connectors.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index fe12d9d91d7a5..e308344344425 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -879,8 +879,10 @@ radeon_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) { @@ -1025,8 +1027,10 @@ radeon_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 = radeon_best_single_encoder(connector); @@ -1163,8 +1167,10 @@ radeon_tv_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 = radeon_best_single_encoder(connector); @@ -1247,8 +1253,10 @@ radeon_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 (radeon_connector->detected_hpd_without_ddc) { @@ -1657,8 +1665,10 @@ radeon_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 && radeon_check_hpd_status_unchanged(connector)) { -- 2.25.1