Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp682080ybt; Sat, 13 Jun 2020 18:26:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsF+X/5G2kR7gqk2IJApSaUenEwT+0kjBEvx7wvbtWVeRcdcgp6QhX9Jxati8aQKdO5X1K X-Received: by 2002:a50:fd01:: with SMTP id i1mr19080529eds.32.1592097985935; Sat, 13 Jun 2020 18:26:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592097985; cv=none; d=google.com; s=arc-20160816; b=ovnMnjSEGxeozzMfh2xA1PUgArGkaxf8J2nYueFox0qiYuaSc/BJjWwo4+5hKfFtdV pWgtijXpNlLK1r0icSgtDGQ17NLTZmjzLjvZixgz24PtWXcVTh5zmle6MgzzvEYHE+la 6a8E1Flg3A7XVFM2mAIvNpifxx/IV6d5WFfKWvHPFy+v17+imMZD/OiD7ottIUDMBvn8 2FsApNXdAPmKQM5qbsBmahK7LwXXmsQ+AYvp8DItxX3A6439rdwPMeTTagFliLRVvpFD s0L7vf1bmC/4XBG38Q1Ve4pecso5bIOWCyrbr/hmO9jeB0sqfNChHyu3cfuR59s9JPnN GNQw== 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 :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter :dmarc-filter; bh=hWaD4fQyHbWq3bbusGJa3obvcK40dmIFPt4HBS/vC+8=; b=sev9DnRSQiWSn53BratPdw3iFgwFiCVKi5f3HG4nY00vP9+5D9HZff7U/tjVXt4f4D MFgYF+7T2TFbiG7shEwkvhChl8g9nMT2thwlJIntQYAaBJ4MX6hTysoD8n93fWDMaisb oWWL0nFo+IhD/1YN4Y+wKoyetT+VS0JyN+FBhlsdQcpWNQDM3XjIfwiIg0tSD2QY7ZhY niKuyg/njTNN/P/JlHSjQFhPXawijnGjVS5d9r8tutTcZ+hSNQj4gX5I8mogwTAxWHzS Krxb0D5765V5u21qGw64mJwEdMc92QToNDgcmJri3dOzZoDMYHNlvLO46v5bY9ORQwW1 a+Sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@umn.edu header.s=google header.b=dnGgxZhW; 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=QUARANTINE sp=NONE dis=NONE) header.from=umn.edu Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a5si188464edq.122.2020.06.13.18.26.03; Sat, 13 Jun 2020 18:26:25 -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=@umn.edu header.s=google header.b=dnGgxZhW; 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=QUARANTINE sp=NONE dis=NONE) header.from=umn.edu Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726868AbgFNBW2 (ORCPT + 99 others); Sat, 13 Jun 2020 21:22:28 -0400 Received: from mta-p6.oit.umn.edu ([134.84.196.206]:33742 "EHLO mta-p6.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726803AbgFNBW2 (ORCPT ); Sat, 13 Jun 2020 21:22:28 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 49kxXL6kwtz9vK03 for ; Sun, 14 Jun 2020 01:22:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E_QQfrHdQb_q for ; Sat, 13 Jun 2020 20:22:26 -0500 (CDT) Received: from mail-io1-f71.google.com (mail-io1-f71.google.com [209.85.166.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id 49kxXL57zpz9vJyx for ; Sat, 13 Jun 2020 20:22:26 -0500 (CDT) DMARC-Filter: OpenDMARC Filter v1.3.2 mta-p6.oit.umn.edu 49kxXL57zpz9vJyx DKIM-Filter: OpenDKIM Filter v2.11.0 mta-p6.oit.umn.edu 49kxXL57zpz9vJyx Received: by mail-io1-f71.google.com with SMTP id d20so8863298iom.16 for ; Sat, 13 Jun 2020 18:22:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=hWaD4fQyHbWq3bbusGJa3obvcK40dmIFPt4HBS/vC+8=; b=dnGgxZhWilGEvZAkDKg8+Db3hNX1+NOCy/4oK32fpCcuIBiSCLn37R9dMCTvR5yOnN m9KEtdopyhDK6ah8M4C/7Ae9EnXaPpr7b6yJHQL8m/jac7VXpHQVtKYFn8bmbq9lSJro ABG7Whrj7bznZW+sAz3bnIzAN9MG0WAH84cqBVbc+2zq+fJd22+zK1m/hZozqp6+NbrO +6OwzFLwRZau6lJ11+eb9xfW5Ew88zoMf1Wlg/Gw79N1J7+tFJJ6PK4TcLjrugCBhiro AgHbHwNXra0eLZ2T1ZjYU+QKKaraFrGqUywmBUY+NPz1nwRsriTRIle/R+A6z7qIMd3d FvMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=hWaD4fQyHbWq3bbusGJa3obvcK40dmIFPt4HBS/vC+8=; b=o/PkX2XRg7akPM2QKKFVOmNfCOPr1/wRVX4Cbpv1Lq8bYfcSVtCnhDy9omWvJkKzqw HBIdzp9YKG3EBfyMhiTaGAILYxHkzZpVZXxDm97UCsOtvY+cflfRlRo+EYMKEondX9/T JgkKrOwT57sANxUKRbeZzxoG2KxzGwbzcTc41cbJ1B/PmZEMrwJg7SP/y28pNcxcNV1V laowdavGI5TqegYy2tk4lVpJfGBDVVg2P2FQ1dVkNrYsCHctTU6Iga6BYPbZ/2PwypVn nwGjZDXNqT9rr+AM6s7M/0bUTwOqjXOgawCTcSva0upRrEK3HuHKJLcmYgbplS5p7zDl dwOA== X-Gm-Message-State: AOAM532S8LAnvo8z2W6vdjCJlrbv+c5+O9LbjPWuZqk2/hkflh3iJUdM 8agXx/0tDjE6A5uvVXcviDn8AbJJIXfMSfrcu6JibOLuYihOTJrMtaasA8jgfFEXQtRT6NZCtwk pVNGQOkYzmQcva2Zs4AfF3JtRADM8 X-Received: by 2002:a5e:dd07:: with SMTP id t7mr21202631iop.21.1592097746366; Sat, 13 Jun 2020 18:22:26 -0700 (PDT) X-Received: by 2002:a5e:dd07:: with SMTP id t7mr21202621iop.21.1592097746172; Sat, 13 Jun 2020 18:22:26 -0700 (PDT) Received: from syssec1.cs.umn.edu ([2607:ea00:101:3c74:d65:8ac4:1b02:86ac]) by smtp.gmail.com with ESMTPSA id j63sm5760966ilg.50.2020.06.13.18.22.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jun 2020 18:22:25 -0700 (PDT) From: Aditya Pakki To: pakki001@umn.edu Cc: kjlu@umn.edu, wu000273@umn.edu, Ben Skeggs , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/nouveau: Fix reference count leak in nouveau_connector_detect Date: Sat, 13 Jun 2020 20:22:23 -0500 Message-Id: <20200614012223.121019-1-pakki001@umn.edu> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org nouveau_connector_detect() calls pm_runtime_get_sync and in turn increments the reference count. In case of failure, decrement the ref count before returning the error. Signed-off-by: Aditya Pakki --- drivers/gpu/drm/nouveau/nouveau_connector.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 1b383ae0248f..ef8ddbe44581 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -572,8 +572,10 @@ nouveau_connector_detect(struct drm_connector *connector, bool force) pm_runtime_get_noresume(dev->dev); } else { ret = pm_runtime_get_sync(dev->dev); - if (ret < 0 && ret != -EACCES) + if (ret < 0 && ret != -EACCES) { + pm_runtime_put_autosuspend(dev->dev); return conn_status; + } } nv_encoder = nouveau_connector_ddc_detect(connector); -- 2.25.1