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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,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 8141FC433E2 for ; Sun, 14 Jun 2020 03:18:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5FB7B2080D for ; Sun, 14 Jun 2020 03:18:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="Mr2pHGWc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726648AbgFNDSj (ORCPT ); Sat, 13 Jun 2020 23:18:39 -0400 Received: from mta-p8.oit.umn.edu ([134.84.196.208]:41534 "EHLO mta-p8.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726527AbgFNDSi (ORCPT ); Sat, 13 Jun 2020 23:18:38 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p8.oit.umn.edu (Postfix) with ESMTP id 49l06P1nHlz9vBtG for ; Sun, 14 Jun 2020 03:18:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p8.oit.umn.edu ([127.0.0.1]) by localhost (mta-p8.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D0tDuFWR-EdG for ; Sat, 13 Jun 2020 22:18:37 -0500 (CDT) Received: from mail-il1-f200.google.com (mail-il1-f200.google.com [209.85.166.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p8.oit.umn.edu (Postfix) with ESMTPS id 49l06N71CPz9vBtL for ; Sat, 13 Jun 2020 22:18:36 -0500 (CDT) DMARC-Filter: OpenDMARC Filter v1.3.2 mta-p8.oit.umn.edu 49l06N71CPz9vBtL DKIM-Filter: OpenDKIM Filter v2.11.0 mta-p8.oit.umn.edu 49l06N71CPz9vBtL Received: by mail-il1-f200.google.com with SMTP id c11so9538404ilq.0 for ; Sat, 13 Jun 2020 20:18:36 -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=HH/45wVNp4vPlnv8y138sW8x+ALttRXOB4XcVO5Zkvs=; b=Mr2pHGWcj5Ed4kB6qg+LD4UU7Fdh03ef8xenaEHX4IejelTQRSts1ZUsupl/mg59zB XF9CR2+v+hbbLsa1MjbFoPtRr5YYVmZ27DlWKM8xPwZf7yGIv0FbMEznM/ntiMvxZUeG i5BHFjA9b7vZXBMhyB/BGgjvsZwwqzLf+OoaQy/+UrP9Kl8BLPEDI2/kbo/YI05R6nGr sHBOTRnMNGIaesLVyR5fQUrz5uwTzAf4si+Y7RZ1cpuY/nTd50V/NwKm9C51Cpc69kZQ 3c/3kaNY/lEordibuKx0qfVo1GwM/l4Loihba7JhTR2rN81SPmcctJMdzUi2yL4uzpdF R9Qg== 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=HH/45wVNp4vPlnv8y138sW8x+ALttRXOB4XcVO5Zkvs=; b=E7EmQWwcs32yzH7mwSPFh9Ri9Jf8TsETQ9Pdm1PbWzECQE/bvcgcL8l1wC1w0zm5jj +N8ph4r8A3MiFg8M+U0tHdk2WRXgqykqY7huzoAZpvimH20YjXEaU62p0xLgMemGQJ9v ZkcyOh2rs0InTHAzki8JcR9QzAz21SXWvIhgzttbFYmD7Zr7Ck6lZ/zT/nHd+93fDAXj MUPxYS71po9WHFAI4cyR2qg8Hs4/28QlaIlbUoXgNq+Tl0ahOM41x2WC2MbuZ+7wW7hk CEYvtPjTQFDhSUwUXhFGoUMOcsVDWFOEGWLt3fDJZa2IW+7J52h1pjUnNf/XeP90Z/4y aO6A== X-Gm-Message-State: AOAM532UVjfyVp8xqDtxq1+g00nfSwTD2LDULRtCy4lVnuwxh3hSXb0s +IZxn6G2BgiS9QYROptbxTGVDKT/ss7wJ3xyWEqzCoxrdX3z/y6RxMsltl/DeL7Vd43wUQw3IR/ AMq2VSX4+CP/QWirN83v8KvK6W52P X-Received: by 2002:a02:707:: with SMTP id f7mr14751038jaf.119.1592104716478; Sat, 13 Jun 2020 20:18:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvhSbDmYnmF5WV63TX3Cq9IgWRZ8Hr8otgBrXO+ItUH+Xf51d8C1dlXHo+xujD8MZenFDLig== X-Received: by 2002:a02:707:: with SMTP id f7mr14751022jaf.119.1592104716193; Sat, 13 Jun 2020 20:18:36 -0700 (PDT) Received: from qiushi.cs.umn.edu ([2607:ea00:101:3c74:4874:45:bcb4:df60]) by smtp.gmail.com with ESMTPSA id b9sm5559725ils.84.2020.06.13.20.18.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jun 2020 20:18:35 -0700 (PDT) From: wu000273@umn.edu To: kjlu@umn.edu Cc: wu000273@umn.edu, Kyungmin Park , Sylwester Nawrocki , Mauro Carvalho Chehab , Kukjin Kim , Krzysztof Kozlowski , linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] media: exynos4-is: Fix several reference count leaks due to pm_runtime_get_sync Date: Sat, 13 Jun 2020 22:18:29 -0500 Message-Id: <20200614031829.31570-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 On calling pm_runtime_get_sync() the reference count of the device is incremented. In case of failure, decrement the reference count before returning the error. Signed-off-by: Qiushi Wu --- drivers/media/platform/exynos4-is/fimc-isp.c | 4 +++- drivers/media/platform/exynos4-is/fimc-lite.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/exynos4-is/fimc-isp.c b/drivers/media/platform/exynos4-is/fimc-isp.c index cde0d254ec1c..a77c49b18511 100644 --- a/drivers/media/platform/exynos4-is/fimc-isp.c +++ b/drivers/media/platform/exynos4-is/fimc-isp.c @@ -305,8 +305,10 @@ static int fimc_isp_subdev_s_power(struct v4l2_subdev *sd, int on) if (on) { ret = pm_runtime_get_sync(&is->pdev->dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put(&is->pdev->dev); return ret; + } set_bit(IS_ST_PWR_ON, &is->state); ret = fimc_is_start_firmware(is); diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c index 394e0818f2d5..92130d779137 100644 --- a/drivers/media/platform/exynos4-is/fimc-lite.c +++ b/drivers/media/platform/exynos4-is/fimc-lite.c @@ -470,7 +470,7 @@ static int fimc_lite_open(struct file *file) set_bit(ST_FLITE_IN_USE, &fimc->state); ret = pm_runtime_get_sync(&fimc->pdev->dev); if (ret < 0) - goto unlock; + goto err_pm; ret = v4l2_fh_open(file); if (ret < 0) -- 2.17.1 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 80C7BC433DF for ; Sun, 14 Jun 2020 03:18:54 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 522EC20739 for ; Sun, 14 Jun 2020 03:18:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="toNRWXGt"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="Mr2pHGWc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 522EC20739 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=umn.edu Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=GYy8cqD6XtYpdqXu4kWkFUdUXk+PiZ0YeG6RwN3gYeM=; b=toN RWXGtgeXpvtc54Etwqyu7/x768I++5XAhWtmwcaY5qjITefJm951vxFJ6UXm53tPNJmcqaGxtaY03 MOEnVB82R2OkfniBKMAlyM5ADHk45m/p467ceVGMoGvFRgdxGDy5jNZDDuNE+xbq7CROHidqsVIhS ooHRJ0hwVp/DnhH6B7b9NvGKYsOudCaAowNdTDm43uW/zqLQWEg3IbWwIRRUKMysWv6c+BwN1Dc6+ D+d25xbMyjlqiiwfSjY3G5Siho2rb00G4XKAEAiLRmR37RG5XjcVxZhme+HdTIIyuP46sJEl653eA S3vgdbbqXyRAeYbExu9q9NEpxd4/2tw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jkJAS-0001lu-4B; Sun, 14 Jun 2020 03:18:44 +0000 Received: from mta-p7.oit.umn.edu ([134.84.196.207]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jkJAO-0001kt-M5 for linux-arm-kernel@lists.infradead.org; Sun, 14 Jun 2020 03:18:42 +0000 Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id 49l06P1L2Hz9vYf9 for ; Sun, 14 Jun 2020 03:18:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p7.oit.umn.edu ([127.0.0.1]) by localhost (mta-p7.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DiTSeQmMTJEa for ; Sat, 13 Jun 2020 22:18:37 -0500 (CDT) Received: from mail-il1-f199.google.com (mail-il1-f199.google.com [209.85.166.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p7.oit.umn.edu (Postfix) with ESMTPS id 49l06N6nr9z9vYdM for ; Sat, 13 Jun 2020 22:18:36 -0500 (CDT) DMARC-Filter: OpenDMARC Filter v1.3.2 mta-p7.oit.umn.edu 49l06N6nr9z9vYdM DKIM-Filter: OpenDKIM Filter v2.11.0 mta-p7.oit.umn.edu 49l06N6nr9z9vYdM Received: by mail-il1-f199.google.com with SMTP id l11so9548813ils.11 for ; Sat, 13 Jun 2020 20:18:36 -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=HH/45wVNp4vPlnv8y138sW8x+ALttRXOB4XcVO5Zkvs=; b=Mr2pHGWcj5Ed4kB6qg+LD4UU7Fdh03ef8xenaEHX4IejelTQRSts1ZUsupl/mg59zB XF9CR2+v+hbbLsa1MjbFoPtRr5YYVmZ27DlWKM8xPwZf7yGIv0FbMEznM/ntiMvxZUeG i5BHFjA9b7vZXBMhyB/BGgjvsZwwqzLf+OoaQy/+UrP9Kl8BLPEDI2/kbo/YI05R6nGr sHBOTRnMNGIaesLVyR5fQUrz5uwTzAf4si+Y7RZ1cpuY/nTd50V/NwKm9C51Cpc69kZQ 3c/3kaNY/lEordibuKx0qfVo1GwM/l4Loihba7JhTR2rN81SPmcctJMdzUi2yL4uzpdF R9Qg== 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=HH/45wVNp4vPlnv8y138sW8x+ALttRXOB4XcVO5Zkvs=; b=rsD+tP29UVHey9zmCwgv8Vx33pmp98UjrAYZva1xigDV2592LMUmuKk5icCBZUe5Cs 7Tl8rXZGlFRLfxPldHuaaniSilV0gIarh8aPGMdzVvpkGyHhASUNqOxv47FKMWoeRXZs Lqqtg23VDnRt03C2VCS2zmueKYJYV3s+EmIIi4iQgMBcFZMuv+9shUV9h2aJunPnZ63C KCJlZWb6W47hALabHIHx2Lxky7qjfQX+iot0+8IhAHbFToay+eZ4S0mF7iyeVvlye0aE Mt913l0SflAvNAx+ysHA8PGJo/0o5VnlcxLEwndhKjU8N/NrEccT2kd5OF+unjuwp8u4 g9gg== X-Gm-Message-State: AOAM532HohpctdbXYYTkRrRKEgOVpNrXwSYvWl81+DeF4DF22+1Da9PO K1L+NUOlDRgnolQFDsN4s4J26vjlQhlsN89RDb2yzJfk82RmPDmW5cBGkkRX+ZdcSJPM27ga/c4 ViNIu9NPHeLy1iohgfp6H+verylCSdAtg+fANZDI= X-Received: by 2002:a02:707:: with SMTP id f7mr14751046jaf.119.1592104716481; Sat, 13 Jun 2020 20:18:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvhSbDmYnmF5WV63TX3Cq9IgWRZ8Hr8otgBrXO+ItUH+Xf51d8C1dlXHo+xujD8MZenFDLig== X-Received: by 2002:a02:707:: with SMTP id f7mr14751022jaf.119.1592104716193; Sat, 13 Jun 2020 20:18:36 -0700 (PDT) Received: from qiushi.cs.umn.edu ([2607:ea00:101:3c74:4874:45:bcb4:df60]) by smtp.gmail.com with ESMTPSA id b9sm5559725ils.84.2020.06.13.20.18.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jun 2020 20:18:35 -0700 (PDT) From: wu000273@umn.edu To: kjlu@umn.edu Subject: [PATCH] media: exynos4-is: Fix several reference count leaks due to pm_runtime_get_sync Date: Sat, 13 Jun 2020 22:18:29 -0500 Message-Id: <20200614031829.31570-1-wu000273@umn.edu> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200613_201840_805931_6D6703CC X-CRM114-Status: GOOD ( 14.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-samsung-soc@vger.kernel.org, wu000273@umn.edu, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Kyungmin Park , Kukjin Kim , Sylwester Nawrocki , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Qiushi Wu On calling pm_runtime_get_sync() the reference count of the device is incremented. In case of failure, decrement the reference count before returning the error. Signed-off-by: Qiushi Wu --- drivers/media/platform/exynos4-is/fimc-isp.c | 4 +++- drivers/media/platform/exynos4-is/fimc-lite.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/exynos4-is/fimc-isp.c b/drivers/media/platform/exynos4-is/fimc-isp.c index cde0d254ec1c..a77c49b18511 100644 --- a/drivers/media/platform/exynos4-is/fimc-isp.c +++ b/drivers/media/platform/exynos4-is/fimc-isp.c @@ -305,8 +305,10 @@ static int fimc_isp_subdev_s_power(struct v4l2_subdev *sd, int on) if (on) { ret = pm_runtime_get_sync(&is->pdev->dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put(&is->pdev->dev); return ret; + } set_bit(IS_ST_PWR_ON, &is->state); ret = fimc_is_start_firmware(is); diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c index 394e0818f2d5..92130d779137 100644 --- a/drivers/media/platform/exynos4-is/fimc-lite.c +++ b/drivers/media/platform/exynos4-is/fimc-lite.c @@ -470,7 +470,7 @@ static int fimc_lite_open(struct file *file) set_bit(ST_FLITE_IN_USE, &fimc->state); ret = pm_runtime_get_sync(&fimc->pdev->dev); if (ret < 0) - goto unlock; + goto err_pm; ret = v4l2_fh_open(file); if (ret < 0) -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel