Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp637048ybt; Sat, 13 Jun 2020 16:36:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3dCiYjvtVBDN4aw/fYJfsD7On52/ahFrmtLEBKcfzbvtYz1yH20XC33KcslfuOqUycXZE X-Received: by 2002:a17:906:8614:: with SMTP id o20mr19869845ejx.444.1592091378851; Sat, 13 Jun 2020 16:36:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592091378; cv=none; d=google.com; s=arc-20160816; b=VqEy+A/TmxbKcOFxx+22cus5I4nEmcH9Bed9LP8OHgftSonva5QDah3h/yNIIc66dQ y2f1YY5kGixjq0oX6/Iks06ezaupZvsTEUkF2z9KagZwlst1YRlvh8YdHTtJsiydXdE3 8i5mrW/NvOw7rtyfYvdBHLQu7lmHSBIG5WslborMZJqjPZRZYGloU1m4WpMx080MW1H0 rdBPT6Ik9XEyPp/OkmTsaoBUR0Ro0DqPa5dEepTA4NBPXbLY3l5RhuYUO7dbFyKvAoZA 5uXZjeEfTb4KWveEjHfIaTGfoZlii7h65dvBZTXtwCOxt8V2ohpn64YN+vFkA9xu/653 rdVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:dmarc-filter; bh=Rw3l/3EgPiLpxwjRCzeT9nx9Fa3fAzHH5ifQjv/65KE=; b=JeXX4ZxBIYr2sQERUIhNateSnVuc8u4di8xTy/hJa57Y7qW7jaUv/pxIgIZ8IVU6z8 cMj9r5TcmwJfD+XAl8mn1QC+ZsIOXrgHl5EE7ZSwCqmG3JSzmu/V+RpYdFZlVUtrHhrC 5NajDEA1hKNL32q3n6TCUYL2kVlcZt9YyvbQ/LsWtD05/MbHfqJL8P//SkC20ke9TBne uDamCuvL4QvsxPn9gfxk87Y9BCxU5GcBXZIMcemABwbiimFsJEXRshlRGn+gqJFSBY87 2Z29YVlJTk9vnscmSgr6+9zmmFi8aIIwWVKNip+C99TbvsuMkVGCpgWZAuAyCfCVFAlr W6zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@umn.edu header.s=google header.b=NpXWPGdo; 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 gr18si6221966ejb.172.2020.06.13.16.35.55; Sat, 13 Jun 2020 16:36:18 -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=NpXWPGdo; 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 S1726747AbgFMXeK (ORCPT + 99 others); Sat, 13 Jun 2020 19:34:10 -0400 Received: from mta-p6.oit.umn.edu ([134.84.196.206]:45088 "EHLO mta-p6.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726462AbgFMXeI (ORCPT ); Sat, 13 Jun 2020 19:34:08 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 49kv7N02qJz9vC9j for ; Sat, 13 Jun 2020 23:34:08 +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 gPtBt1Z30pzo for ; Sat, 13 Jun 2020 18:34:07 -0500 (CDT) Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) (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 49kv7M5YzKz9vC90 for ; Sat, 13 Jun 2020 18:34:07 -0500 (CDT) DMARC-Filter: OpenDMARC Filter v1.3.2 mta-p6.oit.umn.edu 49kv7M5YzKz9vC90 DKIM-Filter: OpenDKIM Filter v2.11.0 mta-p6.oit.umn.edu 49kv7M5YzKz9vC90 Received: by mail-io1-f69.google.com with SMTP id l22so8706390iob.23 for ; Sat, 13 Jun 2020 16:34:07 -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; bh=Rw3l/3EgPiLpxwjRCzeT9nx9Fa3fAzHH5ifQjv/65KE=; b=NpXWPGdo09LFr66WrjTqLnLuG625FPqn7wVIOp3CtrQ9Y5U3G3yvXqolzKUKDqeWF2 TJM4HhWX4zUbCzpJyDFwqG+TL2XqQNvc7wUAV7xJjltfEK/vRm3frHNZkJAVbsMzZJ2l R88awLs4R3u9xFnx7CQ7LEkmACh7CkY+HGIjKsHTWqJJQ48AVQIHhoppZ8KkXi+2WSs4 AlqMsvfsNp7DhA80DKiyfawcNOUxeIMfK9LIlUudk37cMVBbJoE7zbQSlhElAhQFJsJN lq2X+getWxoIVayFeJnSxbu+H3Tg5Psvcjh4S2SNNRxuAu9Cd8/uB4w0mmfF5rw04MEG PDNA== 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; bh=Rw3l/3EgPiLpxwjRCzeT9nx9Fa3fAzHH5ifQjv/65KE=; b=sqwtlfKdNh2hsvKYKvp+4kW5hV5QJSrIl5ewzFWdfKq1Lt7RWABNtXqmUPQM3lG+7w IVDNPqS6oxExQv6aMMBFcT1iKeIj33avN9xDbiz2mnndIomPUl2pUdrAo8mtNDtuOdFC tjWJc82UGGEgLLAsw7UBt+8kFJx/kNAyScQKxtD/s5CL7g+8xCp+sG8PUXqgZsDQsB6F rVT3Ygh3nnL8ULy6Gl2FI6+4z5IIN0waOhfUbVV6Jvirp4vRAfK5IvazQTvIfXsK4oIB oZyD4A9HteIA9dJCvVqVYnkgZvKY8HkEMu4AoQMjPV9IzfNk464LzuLOhLnkBVYrBYJX vfOA== X-Gm-Message-State: AOAM5308iIqbWXbN8igERLEqTSf59nt+nTfCmoPct1BZh5/fI6w8QaFQ Uf35tAKm8rVCS4usdbkXz1znPBcS+60VOjjCiSJNnsuzSirWYWJBNPK5V0adE8a14kHkGBGO4oZ k6jAJGZxG5YbzSomMmZftWzaYpeGd X-Received: by 2002:a92:ce48:: with SMTP id a8mr20221722ilr.23.1592091247041; Sat, 13 Jun 2020 16:34:07 -0700 (PDT) X-Received: by 2002:a92:ce48:: with SMTP id a8mr20221698ilr.23.1592091246738; Sat, 13 Jun 2020 16:34:06 -0700 (PDT) Received: from qiushi.cs.umn.edu ([2607:ea00:101:3c74:4874:45:bcb4:df60]) by smtp.gmail.com with ESMTPSA id v11sm5459221ile.61.2020.06.13.16.34.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jun 2020 16:34:06 -0700 (PDT) From: wu000273@umn.edu To: kjlu@umn.edu Cc: wu000273@umn.edu, Todor Tomov , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Hans Verkuil , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] media: camss: Fix a reference count leak. Date: Sat, 13 Jun 2020 18:34:00 -0500 Message-Id: <20200613233400.20600-1-wu000273@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qiushi Wu Calling pm_runtime_get_sync increments the counter even in case of failure, causing incorrect ref count if pm_runtime_put_sync is not called in error handling paths. Thus replace the jump target "error_pm_runtime_get" by "err_clocks". Fixes: 02afa816dbbf ("media: camss: Add basic runtime PM support") Signed-off-by: Qiushi Wu --- drivers/media/platform/qcom/camss/camss-vfe.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c index a8c542fa647d..1e7f23538af6 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.c +++ b/drivers/media/platform/qcom/camss/camss-vfe.c @@ -1261,7 +1261,7 @@ static int vfe_get(struct vfe_device *vfe) ret = pm_runtime_get_sync(vfe->camss->dev); if (ret < 0) - goto error_pm_runtime_get; + goto error_clocks; ret = vfe_set_clock_rates(vfe); if (ret < 0) @@ -1295,8 +1295,6 @@ static int vfe_get(struct vfe_device *vfe) error_clocks: pm_runtime_put_sync(vfe->camss->dev); - -error_pm_runtime_get: camss_pm_domain_off(vfe->camss, vfe->id); error_pm_domain: -- 2.17.1