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 88ACBC433DF for ; Fri, 21 Aug 2020 16:48:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 64F9220738 for ; Fri, 21 Aug 2020 16:48:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598028502; bh=eoVwXSopgf/xZvR3o8MeKW7Gm09apVd6vtGLYyLUfC0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=prR63NQqMoI5JivAaKtx90DBhkrKj6tlUize9PWVMSXeGllvAF1iCSwKXxrmBicWL P/gke19SOu6b4rgYYkeYH/Ukx0OiLMh8YoVRtS4cTd4LrdMrXBwMbJqZPmB8L8NpgM cX3rEi4cJdGhSHhQRkjKsI4JUGHcbh8szr4upENg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728401AbgHUQsU (ORCPT ); Fri, 21 Aug 2020 12:48:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:50912 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727954AbgHUQUU (ORCPT ); Fri, 21 Aug 2020 12:20:20 -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 938A122EBF; Fri, 21 Aug 2020 16:19:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598026769; bh=eoVwXSopgf/xZvR3o8MeKW7Gm09apVd6vtGLYyLUfC0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yYBK4OeTNi2Te6AlBSJy5MaFuH//E47zqQnqe5L+lch97MJZ25odyf3cygPeVMcfs jvHBbUhAzOXo8VEGAPK3ERbVhiXeVi4UP/H9weG//4fUUeRi+J7VgALG22DM5lg+fr DWW23OuxkpnFXyc9fxXTeKoOlg2pVZQks+Vh5Ge4= 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 4.14 24/30] drm/nouveau/drm/noveau: fix reference count leak in nouveau_fbcon_open Date: Fri, 21 Aug 2020 12:18:51 -0400 Message-Id: <20200821161857.348955-24-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200821161857.348955-1-sashal@kernel.org> References: <20200821161857.348955-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 bfad51c7633325b5d4b32444efe04329d53297b2 ] nouveau_fbcon_open() calls 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_fbcon.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 2b12d82aac150..0e23284fa1a3a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -184,8 +184,10 @@ nouveau_fbcon_open(struct fb_info *info, int user) struct nouveau_fbdev *fbcon = info->par; struct nouveau_drm *drm = nouveau_drm(fbcon->helper.dev); int ret = pm_runtime_get_sync(drm->dev->dev); - if (ret < 0 && ret != -EACCES) + if (ret < 0 && ret != -EACCES) { + pm_runtime_put(drm->dev->dev); return ret; + } return 0; } -- 2.25.1