Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp371224pxa; Fri, 21 Aug 2020 09:20:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1bRHIxOLxrL7D5xLW75wyyFK7wS5xew6+UzuOyr7FpHRizN+FYvhwgpp7TbT2+DFdqVMK X-Received: by 2002:a50:af83:: with SMTP id h3mr3592881edd.139.1598026829517; Fri, 21 Aug 2020 09:20:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598026829; cv=none; d=google.com; s=arc-20160816; b=pJBQRASWAInZLxjfJE+wSJUCPuoLRtsQLM0wZ7zmZc0t+uFsR3l1FzsRijm6yOK2uD waV+nymrC2wbpnhNnVfbV+f2HnsEYKgn6hEEm/SQuHyCSfNXUq20i2aKZJQDzHJoIyEg KsB1fIAWOUmbAmp5Kd+OlTUL9++AybTDh6pEsSY1TYCr+C/9MGRNVX2ftGWBcN9qDoG3 btpEUqZxU6r65/WssAibfalv3IF4QAixBgrtIBoeo+9iN94V2Tb/4LdRjS9miBk3USQg BX5SzS1TSsBEGUlWqhkH92ix2ys07MmyWLCpCYkOxBvC1UsekcIVctoLuzZZfKq/aCCG F02A== 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=dLANr9+ksRZWh4pf3/58GBtjid6zviNWvcrf67RuWr4=; b=ukj/T1Bs6CPh1esT12rAeV2nEjMIoxI5PBP7/VeejF59fSG+Vll+rjfQ8bDFnf7IS9 CGMoFrpDwQiOJ5n37V4McAdQ9/zDIi30w8rPZlaZA8vuLhITv4yaulRIGuYQwZPWEqo5 f4AYxp9Amxx5qeArcGcegp1rljdQobnwX3/GaqEr5/DmPDNGgZ7nQ0fbAoTcX2t2HrOb ZEp4b9C4HPh+hQWwEPgFAMgP9wuVuYowWpIbEhJKnDvi/PUfsi0fhaV8PLQ8zXzXGnNX IvUlbDfXlvoRZBk+Tlcoyk8GoPs2njkGHFW0rstriy7kTVgHvS3rOjtdhVc+LMvDrFUW QBqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ORrcPmUG; 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 cc13si1720694edb.14.2020.08.21.09.20.06; Fri, 21 Aug 2020 09:20:29 -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=ORrcPmUG; 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 S1728013AbgHUQP7 (ORCPT + 99 others); Fri, 21 Aug 2020 12:15:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:46398 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727104AbgHUQOz (ORCPT ); Fri, 21 Aug 2020 12:14:55 -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 E8EF9214F1; Fri, 21 Aug 2020 16:14:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598026494; bh=W2rAa3hVKvGfCtUIdsWN4znjxtVhRCXRyUpQdLekit0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ORrcPmUG8+/aAkJlpqSICxk/MpNksRoWnBHagVzzMbc1gKmihQuydlKo934/qBUv0 dmO8ctu3os++dQ+hyVs9N20KAYr4eB09zXaWxpBzuysrjaTBrVhLTPRjVAskKzZPI3 5f8b3BRoVYnk67I5YnIU1k8cV8BL31On0390dZxw= 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 25/62] drm/amdgpu: fix ref count leak in amdgpu_display_crtc_set_config Date: Fri, 21 Aug 2020 12:13:46 -0400 Message-Id: <20200821161423.347071-25-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 e008fa6fb41544b63973a529b704ef342f47cc65 ] in amdgpu_display_crtc_set_config, 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_display.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index f7143d927b6d8..5e51f0acf744f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@ -282,7 +282,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set, ret = pm_runtime_get_sync(dev->dev); if (ret < 0) - return ret; + goto out; ret = drm_crtc_helper_set_config(set, ctx); @@ -297,7 +297,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set, take the current one */ if (active && !adev->have_disp_power_ref) { adev->have_disp_power_ref = true; - return ret; + goto out; } /* if we have no active crtcs, then drop the power ref we got before */ @@ -306,6 +306,7 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set, adev->have_disp_power_ref = false; } +out: /* drop the power reference we got coming in here */ pm_runtime_put_autosuspend(dev->dev); return ret; -- 2.25.1