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=unavailable 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 36F38C433E1 for ; Fri, 21 Aug 2020 17:20:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 00F2820738 for ; Fri, 21 Aug 2020 17:20:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598030410; bh=Vq2aSLGAryPHdBWvpqIcSYFIIIHj/a+AaaqRd7v+9Z0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QlyyzcV5uTmmWyoPiU0WQNSArP8BUVqsfz9pK2Ci13HzhlYXeCyTwrfxKvv7dWV9g dOaqhHLfPHJ+uasTEw9S2GrM3Bi+VeYe4qM8+e6zqI1thBxV/6Fty39/vLduHjt4bi YwKGPbGnyNo8Ys5thfGafGagqPe7RyBj4oJdGj7I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729012AbgHURUH (ORCPT ); Fri, 21 Aug 2020 13:20:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:49282 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728060AbgHUQQP (ORCPT ); Fri, 21 Aug 2020 12:16:15 -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 4458922B49; Fri, 21 Aug 2020 16:16:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598026575; bh=Vq2aSLGAryPHdBWvpqIcSYFIIIHj/a+AaaqRd7v+9Z0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v2+nZaoAWfASbWoS7Co18DFoOAzOeNlqPN4mSvgB+k/g/JLcHcHvDvJ8m5bZRoq/Y 5e00SPM+CItA3/QcykdMoTyRcbCafgnOKQ4XEYVAgI/gg8UllRQyD9qElmKl8yBFzg qnt0puc7+fnRSgc9yTzH73Y3RDue0VT7jFEeNnMk= 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.7 24/61] drm/amd/display: fix ref count leak in amdgpu_drm_ioctl Date: Fri, 21 Aug 2020 12:15:08 -0400 Message-Id: <20200821161545.347622-24-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200821161545.347622-1-sashal@kernel.org> References: <20200821161545.347622-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 5509ac65f2fe5aa3c0003237ec629ca55024307c ] in amdgpu_drm_ioctl 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_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index a735d79a717be..bac98b1993f2b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -1362,11 +1362,12 @@ long amdgpu_drm_ioctl(struct file *filp, dev = file_priv->minor->dev; ret = pm_runtime_get_sync(dev->dev); if (ret < 0) - return ret; + goto out; ret = drm_ioctl(filp, cmd, arg); pm_runtime_mark_last_busy(dev->dev); +out: pm_runtime_put_autosuspend(dev->dev); return ret; } -- 2.25.1