From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D691C433DF for ; Mon, 10 Aug 2020 19:11:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 196452078D for ; Mon, 10 Aug 2020 19:11:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597086660; bh=1hXMIq9stTbl5HQ93bMflX6VAP6HvLtvNWyOgYwnH5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Q1TLOj/82PFFWuWTOd4oNw99EbdyZko4gPWzoZcVK1yDmL+CG6eS/mvJ2oP6rqTpg P9pHBS9+S1mjqmmSuqKOjUuKyCWH75chawpeoWd6fpUkQSehnfyYq84Hv06EEzDceq loFPYBISLhK5+oH95Z9TQDF5xQuiHsgYsF7P3K10= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729103AbgHJTK5 (ORCPT ); Mon, 10 Aug 2020 15:10:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:38786 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729097AbgHJTK4 (ORCPT ); Mon, 10 Aug 2020 15:10: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 4FF48207FF; Mon, 10 Aug 2020 19:10:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597086656; bh=1hXMIq9stTbl5HQ93bMflX6VAP6HvLtvNWyOgYwnH5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PqEelkBKU6ARLuxFcRJ86a2M4lU/6hs20ta6FYIl37O7eXJy/0SnjtQiVy/oeAZaK NWv7GOaPD5xvL2OQ4A7JBvBCib1OU1O+uUtgxWkUI/0IaSe9fhYAzJwxh7uPH9yz2n RGRgdIY0xSe41PF6wuXHMBsm7DKv5O3AvMv8/Lr4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aditya Pakki , Ben Skeggs , Sasha Levin , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.7 20/60] drm/nouveau: fix reference count leak in nouveau_debugfs_strap_peek Date: Mon, 10 Aug 2020 15:09:48 -0400 Message-Id: <20200810191028.3793884-20-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200810191028.3793884-1-sashal@kernel.org> References: <20200810191028.3793884-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Aditya Pakki [ Upstream commit 8f29432417b11039ef960ab18987c7d61b2b5396 ] nouveau_debugfs_strap_peek() calls pm_runtime_get_sync() that increments the reference count. In case of failure, decrement the ref count before returning the error. Signed-off-by: Aditya Pakki Signed-off-by: Ben Skeggs Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c index 15a3d40edf029..3e15a9d5e8faa 100644 --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c @@ -54,8 +54,10 @@ nouveau_debugfs_strap_peek(struct seq_file *m, void *data) int ret; ret = pm_runtime_get_sync(drm->dev->dev); - if (ret < 0 && ret != -EACCES) + if (ret < 0 && ret != -EACCES) { + pm_runtime_put_autosuspend(drm->dev->dev); return ret; + } seq_printf(m, "0x%08x\n", nvif_rd32(&drm->client.device.object, 0x101000)); -- 2.25.1